summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2023-12-29 12:15:49 +0000
committertb <>2023-12-29 12:15:49 +0000
commitbabb3323a9b758848d4756d3ea704a02aa7f586f (patch)
tree7bbf1b52c13df23cd1d6db518e3ad4a3f8f7aacd /src
parent3bb20b5309c2ee7a1cffbae029be5dbf4306a10b (diff)
downloadopenbsd-babb3323a9b758848d4756d3ea704a02aa7f586f.tar.gz
openbsd-babb3323a9b758848d4756d3ea704a02aa7f586f.tar.bz2
openbsd-babb3323a9b758848d4756d3ea704a02aa7f586f.zip
Garbage collect the last users of SSL_set_debug(3)
This undocumented, incomplete public function has never done anything useful. It will be removed from libssl. Removing it from openssl(1) clears the way for this. ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/s_client.c3
-rw-r--r--src/usr.bin/openssl/s_server.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/s_client.c b/src/usr.bin/openssl/s_client.c
index d993f51636..299042c59a 100644
--- a/src/usr.bin/openssl/s_client.c
+++ b/src/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_client.c,v 1.63 2023/12/29 12:06:48 tb Exp $ */ 1/* $OpenBSD: s_client.c,v 1.64 2023/12/29 12:15:49 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 *
@@ -1125,7 +1125,6 @@ s_client_main(int argc, char **argv)
1125 sbio = BIO_push(test, sbio); 1125 sbio = BIO_push(test, sbio);
1126 } 1126 }
1127 if (cfg.debug) { 1127 if (cfg.debug) {
1128 SSL_set_debug(con, 1);
1129 BIO_set_callback(sbio, bio_dump_callback); 1128 BIO_set_callback(sbio, bio_dump_callback);
1130 BIO_set_callback_arg(sbio, (char *) bio_c_out); 1129 BIO_set_callback_arg(sbio, (char *) bio_c_out);
1131 } 1130 }
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 95fe633ef1..328ac28ab5 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_server.c,v 1.58 2023/07/03 08:03:56 beck Exp $ */ 1/* $OpenBSD: s_server.c,v 1.59 2023/12/29 12:15:49 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 *
@@ -1548,7 +1548,6 @@ sv_body(int s, unsigned char *context)
1548 /* SSL_set_fd(con,s); */ 1548 /* SSL_set_fd(con,s); */
1549 1549
1550 if (cfg.debug) { 1550 if (cfg.debug) {
1551 SSL_set_debug(con, 1);
1552 BIO_set_callback(SSL_get_rbio(con), bio_dump_callback); 1551 BIO_set_callback(SSL_get_rbio(con), bio_dump_callback);
1553 BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out); 1552 BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out);
1554 } 1553 }
@@ -1949,7 +1948,6 @@ www_body(int s, unsigned char *context)
1949 BIO_push(io, ssl_bio); 1948 BIO_push(io, ssl_bio);
1950 1949
1951 if (cfg.debug) { 1950 if (cfg.debug) {
1952 SSL_set_debug(con, 1);
1953 BIO_set_callback(SSL_get_rbio(con), bio_dump_callback); 1951 BIO_set_callback(SSL_get_rbio(con), bio_dump_callback);
1954 BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out); 1952 BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out);
1955 } 1953 }