summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2024-03-02 11:48:56 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2024-03-02 11:48:56 +0000
commit70bee3d6e4c0087efba913c9bdfcff73acf455fc (patch)
tree3d0240529954641080b761e699827a663d837c32
parente8dcb0187a947f9bf0d7dce07032445e7eba62ac (diff)
Remove SSL_debug
The garbage truck is quite full by now. Collect the last symbol straggler for this bump. ok jsing
-rw-r--r--lib/libssl/Symbols.list1
-rw-r--r--lib/libssl/hidden/openssl/ssl.h3
-rw-r--r--lib/libssl/ssl.h3
-rw-r--r--lib/libssl/ssl_lib.c9
4 files changed, 3 insertions, 13 deletions
diff --git a/lib/libssl/Symbols.list b/lib/libssl/Symbols.list
index 63aa8ff0e3e..ee7477f31e5 100644
--- a/lib/libssl/Symbols.list
+++ b/lib/libssl/Symbols.list
@@ -284,7 +284,6 @@ SSL_set_cipher_list
SSL_set_ciphersuites
SSL_set_client_CA_list
SSL_set_connect_state
-SSL_set_debug
SSL_set_ex_data
SSL_set_fd
SSL_set_generate_session_id
diff --git a/lib/libssl/hidden/openssl/ssl.h b/lib/libssl/hidden/openssl/ssl.h
index e0fb89883bf..aa946ad25d6 100644
--- a/lib/libssl/hidden/openssl/ssl.h
+++ b/lib/libssl/hidden/openssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.5 2024/03/02 11:45:51 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.6 2024/03/02 11:48:55 tb Exp $ */
/*
* Copyright (c) 2023 Bob Beck <beck@openbsd.org>
*
@@ -358,7 +358,6 @@ LSSL_USED(SSL_COMP_add_compression_method);
LSSL_USED(SSL_set_session_ticket_ext);
LSSL_USED(SSL_set_session_ticket_ext_cb);
LSSL_USED(SSL_set_session_secret_cb);
-LSSL_USED(SSL_set_debug);
LSSL_USED(SSL_cache_hit);
LSSL_USED(SSL_set_security_level);
LSSL_USED(SSL_get_security_level);
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index e3f536aa438..9a5f8d025ee 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.235 2024/03/02 11:45:51 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.236 2024/03/02 11:48:55 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -1496,7 +1496,6 @@ int SSL_set_session_ticket_ext_cb(SSL *s,
int SSL_set_session_secret_cb(SSL *s,
tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
-void SSL_set_debug(SSL *s, int debug);
int SSL_cache_hit(SSL *s);
/* What the "other" parameter contains in security callback */
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index 3d7810a361e..bb9779bbe99 100644
--- a/lib/libssl/ssl_lib.c
+++ b/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.320 2024/02/04 20:50:23 tb Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.321 2024/03/02 11:48:55 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -3475,13 +3475,6 @@ SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version,
}
LSSL_ALIAS(SSL_set_msg_callback);
-void
-SSL_set_debug(SSL *s, int debug)
-{
- SSLerror(s, ERR_R_DISABLED);
-}
-LSSL_ALIAS(SSL_set_debug);
-
int
SSL_cache_hit(SSL *s)
{