Mark ERR_add_error_data and ERR_add_error_vdata as not for internal use,

and document ERR_asprintf_error_data as their replacement.
ok jsing@, ingo@

2 files changed, 13 insertions, 10 deletions

diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 1b235c1653..ffe25bf465 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.44 2017/02/07 15:52:33 jsing Exp $ */
+/* $OpenBSD: err.c,v 1.45 2017/02/20 23:21:19 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1092,14 +1092,6 @@ ERR_asprintf_error_data(char * format, ...) {
         else
                 ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING);
 }
-void
-ERR_add_error_data(int num, ...)
-{
-        va_list args;
-        va_start(args, num);
-        ERR_add_error_vdata(num, args);
-        va_end(args);
-}
 
 void
 ERR_add_error_vdata(int num, va_list args)
@@ -1121,6 +1113,15 @@ ERR_add_error_vdata(int num, va_list args)
                 ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING);
 }
 
+void
+ERR_add_error_data(int num, ...)
+{
+        va_list args;
+        va_start(args, num);
+        ERR_add_error_vdata(num, args);
+        va_end(args);
+}
+
 int
 ERR_set_mark(void)
 {
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 672dead06b..22cdb2987f 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.24 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: err.h,v 1.25 2017/02/20 23:21:19 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -378,8 +378,10 @@ void ERR_print_errors_fp(FILE *fp);
 void ERR_print_errors(BIO *bp);
 #endif
 void ERR_asprintf_error_data(char * format, ...);
+#ifndef LIBRESSL_INTERNAL
 void ERR_add_error_data(int num, ...);
 void ERR_add_error_vdata(int num, va_list args);
+#endif
 void ERR_load_strings(int lib, ERR_STRING_DATA str[]);
 void ERR_unload_strings(int lib, ERR_STRING_DATA str[]);
 void ERR_load_ERR_strings(void);