diff options
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.c | 24 | ||||
-rw-r--r-- | src/lib/libcrypto/err/err.h | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/hidden/openssl/err.h | 5 |
5 files changed, 3 insertions, 40 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 6a739fa193..8b86545308 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -1119,13 +1119,11 @@ ERR_error_string | |||
1119 | ERR_error_string_n | 1119 | ERR_error_string_n |
1120 | ERR_free_strings | 1120 | ERR_free_strings |
1121 | ERR_func_error_string | 1121 | ERR_func_error_string |
1122 | ERR_get_err_state_table | ||
1123 | ERR_get_error | 1122 | ERR_get_error |
1124 | ERR_get_error_line | 1123 | ERR_get_error_line |
1125 | ERR_get_error_line_data | 1124 | ERR_get_error_line_data |
1126 | ERR_get_next_error_library | 1125 | ERR_get_next_error_library |
1127 | ERR_get_state | 1126 | ERR_get_state |
1128 | ERR_get_string_table | ||
1129 | ERR_lib_error_string | 1127 | ERR_lib_error_string |
1130 | ERR_load_ASN1_strings | 1128 | ERR_load_ASN1_strings |
1131 | ERR_load_BIO_strings | 1129 | ERR_load_BIO_strings |
@@ -1165,7 +1163,6 @@ ERR_print_errors_cb | |||
1165 | ERR_print_errors_fp | 1163 | ERR_print_errors_fp |
1166 | ERR_put_error | 1164 | ERR_put_error |
1167 | ERR_reason_error_string | 1165 | ERR_reason_error_string |
1168 | ERR_release_err_state_table | ||
1169 | ERR_remove_state | 1166 | ERR_remove_state |
1170 | ERR_remove_thread_state | 1167 | ERR_remove_thread_state |
1171 | ERR_set_error_data | 1168 | ERR_set_error_data |
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace index 721c111ff4..18ad57448e 100644 --- a/src/lib/libcrypto/Symbols.namespace +++ b/src/lib/libcrypto/Symbols.namespace | |||
@@ -1390,9 +1390,6 @@ _libre_ERR_free_strings | |||
1390 | _libre_ERR_remove_thread_state | 1390 | _libre_ERR_remove_thread_state |
1391 | _libre_ERR_remove_state | 1391 | _libre_ERR_remove_state |
1392 | _libre_ERR_get_state | 1392 | _libre_ERR_get_state |
1393 | _libre_ERR_get_string_table | ||
1394 | _libre_ERR_get_err_state_table | ||
1395 | _libre_ERR_release_err_state_table | ||
1396 | _libre_ERR_get_next_error_library | 1393 | _libre_ERR_get_next_error_library |
1397 | _libre_ERR_set_mark | 1394 | _libre_ERR_set_mark |
1398 | _libre_ERR_pop_to_mark | 1395 | _libre_ERR_pop_to_mark |
diff --git a/src/lib/libcrypto/err/err.c b/src/lib/libcrypto/err/err.c index 8beb29543a..4b4be213b4 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.55 2023/07/28 10:21:01 tb Exp $ */ | 1 | /* $OpenBSD: err.c,v 1.56 2023/07/28 10:23:19 tb 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 | * |
@@ -952,28 +952,6 @@ ERR_error_string(unsigned long e, char *ret) | |||
952 | } | 952 | } |
953 | LCRYPTO_ALIAS(ERR_error_string); | 953 | LCRYPTO_ALIAS(ERR_error_string); |
954 | 954 | ||
955 | LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void) | ||
956 | { | ||
957 | err_fns_check(); | ||
958 | return ERRFN(err_get)(0); | ||
959 | } | ||
960 | LCRYPTO_ALIAS(ERR_get_string_table); | ||
961 | |||
962 | LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void) | ||
963 | { | ||
964 | err_fns_check(); | ||
965 | return ERRFN(thread_get)(0); | ||
966 | } | ||
967 | LCRYPTO_ALIAS(ERR_get_err_state_table); | ||
968 | |||
969 | void | ||
970 | ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash) | ||
971 | { | ||
972 | err_fns_check(); | ||
973 | ERRFN(thread_release)(hash); | ||
974 | } | ||
975 | LCRYPTO_ALIAS(ERR_release_err_state_table); | ||
976 | |||
977 | const char * | 955 | const char * |
978 | ERR_lib_error_string(unsigned long e) | 956 | ERR_lib_error_string(unsigned long e) |
979 | { | 957 | { |
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h index 703817be33..d85de24cb1 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.30 2023/07/28 10:21:01 tb Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.31 2023/07/28 10:23:19 tb 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 | * |
@@ -399,12 +399,6 @@ void ERR_remove_thread_state(const CRYPTO_THREADID *tid); | |||
399 | void ERR_remove_state(unsigned long pid); | 399 | void ERR_remove_state(unsigned long pid); |
400 | ERR_STATE *ERR_get_state(void); | 400 | ERR_STATE *ERR_get_state(void); |
401 | 401 | ||
402 | #ifndef OPENSSL_NO_LHASH | ||
403 | LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void); | ||
404 | LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void); | ||
405 | void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash); | ||
406 | #endif | ||
407 | |||
408 | int ERR_get_next_error_library(void); | 402 | int ERR_get_next_error_library(void); |
409 | 403 | ||
410 | int ERR_set_mark(void); | 404 | int ERR_set_mark(void); |
diff --git a/src/lib/libcrypto/hidden/openssl/err.h b/src/lib/libcrypto/hidden/openssl/err.h index c53feb89f4..036ead8c08 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.3 2023/07/28 10:21:01 tb Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.4 2023/07/28 10:23:19 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2023 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -54,9 +54,6 @@ LCRYPTO_USED(ERR_free_strings); | |||
54 | LCRYPTO_USED(ERR_remove_thread_state); | 54 | LCRYPTO_USED(ERR_remove_thread_state); |
55 | LCRYPTO_USED(ERR_remove_state); | 55 | LCRYPTO_USED(ERR_remove_state); |
56 | LCRYPTO_USED(ERR_get_state); | 56 | LCRYPTO_USED(ERR_get_state); |
57 | LCRYPTO_USED(ERR_get_string_table); | ||
58 | LCRYPTO_USED(ERR_get_err_state_table); | ||
59 | LCRYPTO_USED(ERR_release_err_state_table); | ||
60 | LCRYPTO_USED(ERR_get_next_error_library); | 57 | LCRYPTO_USED(ERR_get_next_error_library); |
61 | LCRYPTO_USED(ERR_set_mark); | 58 | LCRYPTO_USED(ERR_set_mark); |
62 | LCRYPTO_USED(ERR_pop_to_mark); | 59 | LCRYPTO_USED(ERR_pop_to_mark); |