From f53fd657d51a64e860134199b9354aef200f7da3 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 29 Dec 2023 12:15:49 +0000 Subject: [PATCH] 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 --- usr.bin/openssl/s_client.c | 3 +-- usr.bin/openssl/s_server.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c index d993f516363..299042c59ab 100644 --- a/usr.bin/openssl/s_client.c +++ b/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.63 2023/12/29 12:06:48 tb Exp $ */ +/* $OpenBSD: s_client.c,v 1.64 2023/12/29 12:15:49 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1125,7 +1125,6 @@ s_client_main(int argc, char **argv) sbio = BIO_push(test, sbio); } if (cfg.debug) { - SSL_set_debug(con, 1); BIO_set_callback(sbio, bio_dump_callback); BIO_set_callback_arg(sbio, (char *) bio_c_out); } diff --git a/usr.bin/openssl/s_server.c b/usr.bin/openssl/s_server.c index 95fe633ef1e..328ac28ab56 100644 --- a/usr.bin/openssl/s_server.c +++ b/usr.bin/openssl/s_server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_server.c,v 1.58 2023/07/03 08:03:56 beck Exp $ */ +/* $OpenBSD: s_server.c,v 1.59 2023/12/29 12:15:49 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1548,7 +1548,6 @@ sv_body(int s, unsigned char *context) /* SSL_set_fd(con,s); */ if (cfg.debug) { - SSL_set_debug(con, 1); BIO_set_callback(SSL_get_rbio(con), bio_dump_callback); BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out); } @@ -1949,7 +1948,6 @@ www_body(int s, unsigned char *context) BIO_push(io, ssl_bio); if (cfg.debug) { - SSL_set_debug(con, 1); BIO_set_callback(SSL_get_rbio(con), bio_dump_callback); BIO_set_callback_arg(SSL_get_rbio(con), (char *) bio_s_out); } -- 2.20.1