From: jsing <jsing@openbsd.org>
Date: Wed, 24 Jun 2015 10:05:14 +0000 (+0000)
Subject: Put BUF_memdup() and BUF_reverse() under #ifndef LIBRESSL_INTERNAL.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=78a9c1b22d7ae88eabd4e1525c2c1d3b546f9baa;p=openbsd

Put BUF_memdup() and BUF_reverse() under #ifndef LIBRESSL_INTERNAL.
---

diff --git a/lib/libcrypto/buffer/buffer.h b/lib/libcrypto/buffer/buffer.h
index 5aa0e3ea474..ed6dac0e69f 100644
--- a/lib/libcrypto/buffer/buffer.h
+++ b/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.14 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: buffer.h,v 1.15 2015/06/24 10:05:14 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,14 +84,13 @@ BUF_MEM *BUF_MEM_new(void);
 void	BUF_MEM_free(BUF_MEM *a);
 int	BUF_MEM_grow(BUF_MEM *str, size_t len);
 int	BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
+
 #ifndef LIBRESSL_INTERNAL
 char *	BUF_strdup(const char *str);
 char *	BUF_strndup(const char *str, size_t siz);
-#endif
 void *	BUF_memdup(const void *data, size_t siz);
 void	BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
-#ifndef LIBRESSL_INTERNAL
 /* safe string functions */
 size_t BUF_strlcpy(char *dst, const char *src, size_t siz)
 	__attribute__ ((__bounded__(__string__,1,3)));
diff --git a/lib/libssl/src/crypto/buffer/buffer.h b/lib/libssl/src/crypto/buffer/buffer.h
index 5aa0e3ea474..ed6dac0e69f 100644
--- a/lib/libssl/src/crypto/buffer/buffer.h
+++ b/lib/libssl/src/crypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.14 2014/10/16 03:19:02 beck Exp $ */
+/* $OpenBSD: buffer.h,v 1.15 2015/06/24 10:05:14 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,14 +84,13 @@ BUF_MEM *BUF_MEM_new(void);
 void	BUF_MEM_free(BUF_MEM *a);
 int	BUF_MEM_grow(BUF_MEM *str, size_t len);
 int	BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
+
 #ifndef LIBRESSL_INTERNAL
 char *	BUF_strdup(const char *str);
 char *	BUF_strndup(const char *str, size_t siz);
-#endif
 void *	BUF_memdup(const void *data, size_t siz);
 void	BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
-#ifndef LIBRESSL_INTERNAL
 /* safe string functions */
 size_t BUF_strlcpy(char *dst, const char *src, size_t siz)
 	__attribute__ ((__bounded__(__string__,1,3)));