From: beck <beck@openbsd.org>
Date: Tue, 9 Jul 2024 07:17:13 +0000 (+0000)
Subject: Hide remaining unused ERR functions in err.h
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4b5cae0be18b4c05ddbbd9e2646e9741e3663b3a;p=openbsd

Hide remaining unused ERR functions in err.h

ok tb@
---

diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index 4e4f80bc190..48ee1b98109 100644
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -3347,6 +3347,8 @@ _libre_lh_error
 _libre_DES_check_key
 _libre_DES_rw_mode
 _libre_CRYPTO_get_dynlock_create_callback
+_libre_ERR_add_error_data
+_libre_ERR_add_error_vdata
 _libre_RSAPublicKey_it
 _libre_RSAPrivateKey_it
 _libre_RSA_PSS_PARAMS_it
diff --git a/lib/libcrypto/err/err.c b/lib/libcrypto/err/err.c
index 583293e793e..e40b52f5ecf 100644
--- a/lib/libcrypto/err/err.c
+++ b/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.c,v 1.61 2024/06/24 06:43:22 tb Exp $ */
+/* $OpenBSD: err.c,v 1.62 2024/07/09 07:17:13 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1149,6 +1149,7 @@ ERR_add_error_vdata(int num, va_list args)
 	else
 		ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING);
 }
+LCRYPTO_ALIAS(ERR_add_error_vdata);
 
 void
 ERR_add_error_data(int num, ...)
@@ -1158,6 +1159,7 @@ ERR_add_error_data(int num, ...)
 	ERR_add_error_vdata(num, args);
 	va_end(args);
 }
+LCRYPTO_ALIAS(ERR_add_error_data);
 
 int
 ERR_set_mark(void)
diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h
index 8beab1487e5..9f64dd2797b 100644
--- a/lib/libcrypto/err/err.h
+++ b/lib/libcrypto/err/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.33 2024/03/02 10:32:26 tb Exp $ */
+/* $OpenBSD: err.h,v 1.34 2024/07/09 07:17:13 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -374,10 +374,8 @@ 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);
diff --git a/lib/libcrypto/hidden/openssl/err.h b/lib/libcrypto/hidden/openssl/err.h
index 08f97e1c5db..5a5893f8137 100644
--- a/lib/libcrypto/hidden/openssl/err.h
+++ b/lib/libcrypto/hidden/openssl/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.5 2024/03/02 10:30:48 tb Exp $ */
+/* $OpenBSD: err.h,v 1.6 2024/07/09 07:17:13 beck Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -56,5 +56,7 @@ LCRYPTO_USED(ERR_remove_state);
 LCRYPTO_USED(ERR_get_next_error_library);
 LCRYPTO_USED(ERR_set_mark);
 LCRYPTO_USED(ERR_pop_to_mark);
+LCRYPTO_UNUSED(ERR_add_error_data);
+LCRYPTO_UNUSED(ERR_add_error_vdata);
 
 #endif /* _LIBCRYPTO_ERR_H */