summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2024-03-02 11:48:55 +0000
committertb <>2024-03-02 11:48:55 +0000
commit174854bd545b2940c157a447e92f7cf70091df68 (patch)
tree146435a07b0ef18f422e732ae91a24efb7ca6593 /src/lib
parent11bc4cabe92deceb37bc90b3965a5711d636d385 (diff)
downloadopenbsd-174854bd545b2940c157a447e92f7cf70091df68.tar.gz
openbsd-174854bd545b2940c157a447e92f7cf70091df68.tar.bz2
openbsd-174854bd545b2940c157a447e92f7cf70091df68.zip
Remove SSL_debug
The garbage truck is quite full by now. Collect the last symbol straggler for this bump. ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/Symbols.list1
-rw-r--r--src/lib/libssl/hidden/openssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl_lib.c9
4 files changed, 3 insertions, 13 deletions
diff --git a/src/lib/libssl/Symbols.list b/src/lib/libssl/Symbols.list
index 63aa8ff0e3..ee7477f31e 100644
--- a/src/lib/libssl/Symbols.list
+++ b/src/lib/libssl/Symbols.list
@@ -284,7 +284,6 @@ SSL_set_cipher_list
284SSL_set_ciphersuites 284SSL_set_ciphersuites
285SSL_set_client_CA_list 285SSL_set_client_CA_list
286SSL_set_connect_state 286SSL_set_connect_state
287SSL_set_debug
288SSL_set_ex_data 287SSL_set_ex_data
289SSL_set_fd 288SSL_set_fd
290SSL_set_generate_session_id 289SSL_set_generate_session_id
diff --git a/src/lib/libssl/hidden/openssl/ssl.h b/src/lib/libssl/hidden/openssl/ssl.h
index e0fb89883b..aa946ad25d 100644
--- a/src/lib/libssl/hidden/openssl/ssl.h
+++ b/src/lib/libssl/hidden/openssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.5 2024/03/02 11:45:51 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.6 2024/03/02 11:48:55 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -358,7 +358,6 @@ LSSL_USED(SSL_COMP_add_compression_method);
358LSSL_USED(SSL_set_session_ticket_ext); 358LSSL_USED(SSL_set_session_ticket_ext);
359LSSL_USED(SSL_set_session_ticket_ext_cb); 359LSSL_USED(SSL_set_session_ticket_ext_cb);
360LSSL_USED(SSL_set_session_secret_cb); 360LSSL_USED(SSL_set_session_secret_cb);
361LSSL_USED(SSL_set_debug);
362LSSL_USED(SSL_cache_hit); 361LSSL_USED(SSL_cache_hit);
363LSSL_USED(SSL_set_security_level); 362LSSL_USED(SSL_set_security_level);
364LSSL_USED(SSL_get_security_level); 363LSSL_USED(SSL_get_security_level);
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index e3f536aa43..9a5f8d025e 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl.h,v 1.235 2024/03/02 11:45:51 tb Exp $ */ 1/* $OpenBSD: ssl.h,v 1.236 2024/03/02 11:48:55 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 *
@@ -1496,7 +1496,6 @@ int SSL_set_session_ticket_ext_cb(SSL *s,
1496int SSL_set_session_secret_cb(SSL *s, 1496int SSL_set_session_secret_cb(SSL *s,
1497 tls_session_secret_cb_fn tls_session_secret_cb, void *arg); 1497 tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
1498 1498
1499void SSL_set_debug(SSL *s, int debug);
1500int SSL_cache_hit(SSL *s); 1499int SSL_cache_hit(SSL *s);
1501 1500
1502/* What the "other" parameter contains in security callback */ 1501/* What the "other" parameter contains in security callback */
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 3d7810a361..bb9779bbe9 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_lib.c,v 1.320 2024/02/04 20:50:23 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.321 2024/03/02 11:48:55 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 *
@@ -3475,13 +3475,6 @@ SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version,
3475} 3475}
3476LSSL_ALIAS(SSL_set_msg_callback); 3476LSSL_ALIAS(SSL_set_msg_callback);
3477 3477
3478void
3479SSL_set_debug(SSL *s, int debug)
3480{
3481 SSLerror(s, ERR_R_DISABLED);
3482}
3483LSSL_ALIAS(SSL_set_debug);
3484
3485int 3478int
3486SSL_cache_hit(SSL *s) 3479SSL_cache_hit(SSL *s)
3487{ 3480{