diff options
-rw-r--r-- | lib/libcrypto/Symbols.list | 3 | ||||
-rw-r--r-- | lib/libcrypto/Symbols.namespace | 3 | ||||
-rw-r--r-- | lib/libcrypto/err/err.c | 24 | ||||
-rw-r--r-- | lib/libcrypto/err/err.h | 8 | ||||
-rw-r--r-- | lib/libcrypto/hidden/openssl/err.h | 5 |
5 files changed, 3 insertions, 40 deletions
diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index 6a739fa1931..8b865453084 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -1119,13 +1119,11 @@ ERR_error_string ERR_error_string_n ERR_free_strings ERR_func_error_string -ERR_get_err_state_table ERR_get_error ERR_get_error_line ERR_get_error_line_data ERR_get_next_error_library ERR_get_state -ERR_get_string_table ERR_lib_error_string ERR_load_ASN1_strings ERR_load_BIO_strings @@ -1165,7 +1163,6 @@ ERR_print_errors_cb ERR_print_errors_fp ERR_put_error ERR_reason_error_string -ERR_release_err_state_table ERR_remove_state ERR_remove_thread_state ERR_set_error_data diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index 721c111ff4a..18ad57448ed 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -1390,9 +1390,6 @@ _libre_ERR_free_strings _libre_ERR_remove_thread_state _libre_ERR_remove_state _libre_ERR_get_state -_libre_ERR_get_string_table -_libre_ERR_get_err_state_table -_libre_ERR_release_err_state_table _libre_ERR_get_next_error_library _libre_ERR_set_mark _libre_ERR_pop_to_mark diff --git a/lib/libcrypto/err/err.c b/lib/libcrypto/err/err.c index 8beb29543a5..4b4be213b4e 100644 --- a/lib/libcrypto/err/err.c +++ b/lib/libcrypto/err/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.55 2023/07/28 10:21:01 tb Exp $ */ +/* $OpenBSD: err.c,v 1.56 2023/07/28 10:23:19 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -952,28 +952,6 @@ ERR_error_string(unsigned long e, char *ret) } LCRYPTO_ALIAS(ERR_error_string); -LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void) -{ - err_fns_check(); - return ERRFN(err_get)(0); -} -LCRYPTO_ALIAS(ERR_get_string_table); - -LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void) -{ - err_fns_check(); - return ERRFN(thread_get)(0); -} -LCRYPTO_ALIAS(ERR_get_err_state_table); - -void -ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash) -{ - err_fns_check(); - ERRFN(thread_release)(hash); -} -LCRYPTO_ALIAS(ERR_release_err_state_table); - const char * ERR_lib_error_string(unsigned long e) { diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h index 703817be332..d85de24cb11 100644 --- a/lib/libcrypto/err/err.h +++ b/lib/libcrypto/err/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.30 2023/07/28 10:21:01 tb Exp $ */ +/* $OpenBSD: err.h,v 1.31 2023/07/28 10:23:19 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -399,12 +399,6 @@ void ERR_remove_thread_state(const CRYPTO_THREADID *tid); void ERR_remove_state(unsigned long pid); ERR_STATE *ERR_get_state(void); -#ifndef OPENSSL_NO_LHASH -LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void); -LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void); -void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash); -#endif - int ERR_get_next_error_library(void); int ERR_set_mark(void); diff --git a/lib/libcrypto/hidden/openssl/err.h b/lib/libcrypto/hidden/openssl/err.h index c53feb89f4c..036ead8c089 100644 --- a/lib/libcrypto/hidden/openssl/err.h +++ b/lib/libcrypto/hidden/openssl/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.3 2023/07/28 10:21:01 tb Exp $ */ +/* $OpenBSD: err.h,v 1.4 2023/07/28 10:23:19 tb Exp $ */ /* * Copyright (c) 2023 Bob Beck <beck@openbsd.org> * @@ -54,9 +54,6 @@ LCRYPTO_USED(ERR_free_strings); LCRYPTO_USED(ERR_remove_thread_state); LCRYPTO_USED(ERR_remove_state); LCRYPTO_USED(ERR_get_state); -LCRYPTO_USED(ERR_get_string_table); -LCRYPTO_USED(ERR_get_err_state_table); -LCRYPTO_USED(ERR_release_err_state_table); LCRYPTO_USED(ERR_get_next_error_library); LCRYPTO_USED(ERR_set_mark); LCRYPTO_USED(ERR_pop_to_mark); |