summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-07-28 10:23:19 +0000
committertb <>2023-07-28 10:23:19 +0000
commit45d802c85cbb3541a9917588d2581014878e586e (patch)
treeff34d67029a45d0cec3417bd5a94a62ffda77cde
parente68ca11e376f4237fb9f8c10487e2d7b7dbfe585 (diff)
downloadopenbsd-45d802c85cbb3541a9917588d2581014878e586e.tar.gz
openbsd-45d802c85cbb3541a9917588d2581014878e586e.tar.bz2
openbsd-45d802c85cbb3541a9917588d2581014878e586e.zip
Remove more ERR cruft
Ever wondered how many entries populate the various err hashes? Me neither. Remove this garbage. ok jsing
-rw-r--r--src/lib/libcrypto/Symbols.list3
-rw-r--r--src/lib/libcrypto/Symbols.namespace3
-rw-r--r--src/lib/libcrypto/err/err.c24
-rw-r--r--src/lib/libcrypto/err/err.h8
-rw-r--r--src/lib/libcrypto/hidden/openssl/err.h5
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
1119ERR_error_string_n 1119ERR_error_string_n
1120ERR_free_strings 1120ERR_free_strings
1121ERR_func_error_string 1121ERR_func_error_string
1122ERR_get_err_state_table
1123ERR_get_error 1122ERR_get_error
1124ERR_get_error_line 1123ERR_get_error_line
1125ERR_get_error_line_data 1124ERR_get_error_line_data
1126ERR_get_next_error_library 1125ERR_get_next_error_library
1127ERR_get_state 1126ERR_get_state
1128ERR_get_string_table
1129ERR_lib_error_string 1127ERR_lib_error_string
1130ERR_load_ASN1_strings 1128ERR_load_ASN1_strings
1131ERR_load_BIO_strings 1129ERR_load_BIO_strings
@@ -1165,7 +1163,6 @@ ERR_print_errors_cb
1165ERR_print_errors_fp 1163ERR_print_errors_fp
1166ERR_put_error 1164ERR_put_error
1167ERR_reason_error_string 1165ERR_reason_error_string
1168ERR_release_err_state_table
1169ERR_remove_state 1166ERR_remove_state
1170ERR_remove_thread_state 1167ERR_remove_thread_state
1171ERR_set_error_data 1168ERR_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}
953LCRYPTO_ALIAS(ERR_error_string); 953LCRYPTO_ALIAS(ERR_error_string);
954 954
955LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void)
956{
957 err_fns_check();
958 return ERRFN(err_get)(0);
959}
960LCRYPTO_ALIAS(ERR_get_string_table);
961
962LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void)
963{
964 err_fns_check();
965 return ERRFN(thread_get)(0);
966}
967LCRYPTO_ALIAS(ERR_get_err_state_table);
968
969void
970ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash)
971{
972 err_fns_check();
973 ERRFN(thread_release)(hash);
974}
975LCRYPTO_ALIAS(ERR_release_err_state_table);
976
977const char * 955const char *
978ERR_lib_error_string(unsigned long e) 956ERR_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);
399void ERR_remove_state(unsigned long pid); 399void ERR_remove_state(unsigned long pid);
400ERR_STATE *ERR_get_state(void); 400ERR_STATE *ERR_get_state(void);
401 401
402#ifndef OPENSSL_NO_LHASH
403LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
404LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
405void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
406#endif
407
408int ERR_get_next_error_library(void); 402int ERR_get_next_error_library(void);
409 403
410int ERR_set_mark(void); 404int 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);
54LCRYPTO_USED(ERR_remove_thread_state); 54LCRYPTO_USED(ERR_remove_thread_state);
55LCRYPTO_USED(ERR_remove_state); 55LCRYPTO_USED(ERR_remove_state);
56LCRYPTO_USED(ERR_get_state); 56LCRYPTO_USED(ERR_get_state);
57LCRYPTO_USED(ERR_get_string_table);
58LCRYPTO_USED(ERR_get_err_state_table);
59LCRYPTO_USED(ERR_release_err_state_table);
60LCRYPTO_USED(ERR_get_next_error_library); 57LCRYPTO_USED(ERR_get_next_error_library);
61LCRYPTO_USED(ERR_set_mark); 58LCRYPTO_USED(ERR_set_mark);
62LCRYPTO_USED(ERR_pop_to_mark); 59LCRYPTO_USED(ERR_pop_to_mark);