3 files changed, 12 insertions, 17 deletions

diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c
index 8256e89843..dd5cc5e173 100644
--- a/src/lib/libcrypto/buffer/buf_err.c
+++ b/src/lib/libcrypto/buffer/buf_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_err.c,v 1.10 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: buf_err.c,v 1.11 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -72,12 +72,7 @@
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_BUF,0,reason)
 
 static ERR_STRING_DATA BUF_str_functs[] = {
-        {ERR_FUNC(BUF_F_BUF_MEMDUP),    "BUF_memdup"},
-        {ERR_FUNC(BUF_F_BUF_MEM_GROW),  "BUF_MEM_grow"},
-        {ERR_FUNC(BUF_F_BUF_MEM_GROW_CLEAN),    "BUF_MEM_grow_clean"},
-        {ERR_FUNC(BUF_F_BUF_MEM_NEW),   "BUF_MEM_new"},
-        {ERR_FUNC(BUF_F_BUF_STRDUP),    "BUF_strdup"},
-        {ERR_FUNC(BUF_F_BUF_STRNDUP),   "BUF_strndup"},
+        {ERR_FUNC(0xfff), "CRYPTO_internal"},
         {0, NULL}
 };
 
diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c
index f7e4c0b966..a9ab87a09f 100644
--- a/src/lib/libcrypto/buffer/buf_str.c
+++ b/src/lib/libcrypto/buffer/buf_str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_str.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: buf_str.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */
 /*
  * Copyright (c) 2014 Bob Beck
  *
@@ -35,7 +35,7 @@ BUF_strdup(const char *str)
 
         if (str != NULL) {
                 if (!(ret = strdup(str)))
-                        BUFerr(BUF_F_BUF_STRDUP, ERR_R_MALLOC_FAILURE);
+                        BUFerror(ERR_R_MALLOC_FAILURE);
         }
         return ret;
 }
@@ -47,7 +47,7 @@ BUF_strndup(const char *str, size_t siz)
 
         if (str != NULL) {
                 if (!(ret = strndup(str, siz)))
-                        BUFerr(BUF_F_BUF_STRNDUP, ERR_R_MALLOC_FAILURE);
+                        BUFerror(ERR_R_MALLOC_FAILURE);
         }
         return ret;
 }
@@ -59,7 +59,7 @@ BUF_memdup(const void *data, size_t siz)
 
         if (data != NULL) {
                 if (!(ret = malloc(siz)))
-                        BUFerr(BUF_F_BUF_MEMDUP, ERR_R_MALLOC_FAILURE);
+                        BUFerror(ERR_R_MALLOC_FAILURE);
                 else
                         (void) memcpy(ret, data, siz);
         }
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c
index ac3729d52b..e32abb14f3 100644
--- a/src/lib/libcrypto/buffer/buffer.c
+++ b/src/lib/libcrypto/buffer/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.21 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: buffer.c,v 1.22 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -75,7 +75,7 @@ BUF_MEM_new(void)
 
         ret = malloc(sizeof(BUF_MEM));
         if (ret == NULL) {
-                BUFerr(BUF_F_BUF_MEM_NEW, ERR_R_MALLOC_FAILURE);
+                BUFerror(ERR_R_MALLOC_FAILURE);
                 return (NULL);
         }
         ret->length = 0;
@@ -114,13 +114,13 @@ BUF_MEM_grow(BUF_MEM *str, size_t len)
         }
         /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
         if (len > LIMIT_BEFORE_EXPANSION) {
-                BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE);
+                BUFerror(ERR_R_MALLOC_FAILURE);
                 return 0;
         }
         n = (len + 3) / 3 * 4;
         ret = realloc(str->data, n);
         if (ret == NULL) {
-                BUFerr(BUF_F_BUF_MEM_GROW, ERR_R_MALLOC_FAILURE);
+                BUFerror(ERR_R_MALLOC_FAILURE);
                 len = 0;
         } else {
                 str->data = ret;
@@ -149,7 +149,7 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
         }
         /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
         if (len > LIMIT_BEFORE_EXPANSION) {
-                BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE);
+                BUFerror(ERR_R_MALLOC_FAILURE);
                 return 0;
         }
         n = (len + 3) / 3 * 4;
@@ -161,7 +161,7 @@ BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
                 free(str->data);
         }
         if (ret == NULL) {
-                BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE);
+                BUFerror(ERR_R_MALLOC_FAILURE);
                 len = 0;
         } else {
                 str->data = ret;