summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/Symbols.namespace2
-rw-r--r--src/lib/libcrypto/err/err.c4
-rw-r--r--src/lib/libcrypto/err/err.h4
-rw-r--r--src/lib/libcrypto/hidden/openssl/err.h4
4 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 4e4f80bc19..48ee1b9810 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -3347,6 +3347,8 @@ _libre_lh_error
3347_libre_DES_check_key 3347_libre_DES_check_key
3348_libre_DES_rw_mode 3348_libre_DES_rw_mode
3349_libre_CRYPTO_get_dynlock_create_callback 3349_libre_CRYPTO_get_dynlock_create_callback
3350_libre_ERR_add_error_data
3351_libre_ERR_add_error_vdata
3350_libre_RSAPublicKey_it 3352_libre_RSAPublicKey_it
3351_libre_RSAPrivateKey_it 3353_libre_RSAPrivateKey_it
3352_libre_RSA_PSS_PARAMS_it 3354_libre_RSA_PSS_PARAMS_it
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c
index 583293e793..e40b52f5ec 100644
--- a/src/lib/libcrypto/err/err.c
+++ b/src/lib/libcrypto/err/err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.c,v 1.61 2024/06/24 06:43:22 tb Exp $ */ 1/* $OpenBSD: err.c,v 1.62 2024/07/09 07:17:13 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1149,6 +1149,7 @@ ERR_add_error_vdata(int num, va_list args)
1149 else 1149 else
1150 ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING); 1150 ERR_set_error_data(errbuf, ERR_TXT_MALLOCED|ERR_TXT_STRING);
1151} 1151}
1152LCRYPTO_ALIAS(ERR_add_error_vdata);
1152 1153
1153void 1154void
1154ERR_add_error_data(int num, ...) 1155ERR_add_error_data(int num, ...)
@@ -1158,6 +1159,7 @@ ERR_add_error_data(int num, ...)
1158 ERR_add_error_vdata(num, args); 1159 ERR_add_error_vdata(num, args);
1159 va_end(args); 1160 va_end(args);
1160} 1161}
1162LCRYPTO_ALIAS(ERR_add_error_data);
1161 1163
1162int 1164int
1163ERR_set_mark(void) 1165ERR_set_mark(void)
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 8beab1487e..9f64dd2797 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.h,v 1.33 2024/03/02 10:32:26 tb Exp $ */ 1/* $OpenBSD: err.h,v 1.34 2024/07/09 07:17:13 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -374,10 +374,8 @@ void ERR_print_errors_fp(FILE *fp);
374void ERR_print_errors(BIO *bp); 374void ERR_print_errors(BIO *bp);
375#endif 375#endif
376void ERR_asprintf_error_data(char * format, ...); 376void ERR_asprintf_error_data(char * format, ...);
377#ifndef LIBRESSL_INTERNAL
378void ERR_add_error_data(int num, ...); 377void ERR_add_error_data(int num, ...);
379void ERR_add_error_vdata(int num, va_list args); 378void ERR_add_error_vdata(int num, va_list args);
380#endif
381void ERR_load_strings(int lib, ERR_STRING_DATA *str); 379void ERR_load_strings(int lib, ERR_STRING_DATA *str);
382void ERR_unload_strings(int lib, ERR_STRING_DATA *str); 380void ERR_unload_strings(int lib, ERR_STRING_DATA *str);
383void ERR_load_ERR_strings(void); 381void ERR_load_ERR_strings(void);
diff --git a/src/lib/libcrypto/hidden/openssl/err.h b/src/lib/libcrypto/hidden/openssl/err.h
index 08f97e1c5d..5a5893f813 100644
--- a/src/lib/libcrypto/hidden/openssl/err.h
+++ b/src/lib/libcrypto/hidden/openssl/err.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.h,v 1.5 2024/03/02 10:30:48 tb Exp $ */ 1/* $OpenBSD: err.h,v 1.6 2024/07/09 07:17:13 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -56,5 +56,7 @@ LCRYPTO_USED(ERR_remove_state);
56LCRYPTO_USED(ERR_get_next_error_library); 56LCRYPTO_USED(ERR_get_next_error_library);
57LCRYPTO_USED(ERR_set_mark); 57LCRYPTO_USED(ERR_set_mark);
58LCRYPTO_USED(ERR_pop_to_mark); 58LCRYPTO_USED(ERR_pop_to_mark);
59LCRYPTO_UNUSED(ERR_add_error_data);
60LCRYPTO_UNUSED(ERR_add_error_vdata);
59 61
60#endif /* _LIBCRYPTO_ERR_H */ 62#endif /* _LIBCRYPTO_ERR_H */