diff options
| author | tb <> | 2023-12-29 12:24:33 +0000 |
|---|---|---|
| committer | tb <> | 2023-12-29 12:24:33 +0000 |
| commit | 9968234501cfdecd94c72061bdad038b9f340d50 (patch) | |
| tree | 63b098be008d3bd6041d78d9a5fe9c6c51396721 /src/lib/libssl/ssl_lib.c | |
| parent | 47579f77bfbf210abc8b63d1bf6acfd9926ff7f7 (diff) | |
| download | openbsd-9968234501cfdecd94c72061bdad038b9f340d50.tar.gz openbsd-9968234501cfdecd94c72061bdad038b9f340d50.tar.bz2 openbsd-9968234501cfdecd94c72061bdad038b9f340d50.zip | |
Neuter the SSL_set_debug(3) API
The TLSv1.3 stack didn't support this in the first place, and in the legacy
stack it only added some dubious BIO_flush(3) calls. The sleep call between
SSL_read(3) and SSL_write(3) advertised in the comment next to the flag has
been a sleep call in the s_server since time immemorial, nota bene between
calls to BIO_gets(3). Anyway. This can all go and what remains will go with
the next major bump.
ok jsing
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index ce14ce710a..c97441c9c0 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.317 2023/11/29 13:39:34 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.318 2023/12/29 12:24:33 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 | * |
| @@ -2933,8 +2933,6 @@ SSL_dup(SSL *s) | |||
| 2933 | 2933 | ||
| 2934 | SSL_set_info_callback(ret, SSL_get_info_callback(s)); | 2934 | SSL_set_info_callback(ret, SSL_get_info_callback(s)); |
| 2935 | 2935 | ||
| 2936 | ret->debug = s->debug; | ||
| 2937 | |||
| 2938 | /* copy app data, a little dangerous perhaps */ | 2936 | /* copy app data, a little dangerous perhaps */ |
| 2939 | if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL, | 2937 | if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL, |
| 2940 | &ret->ex_data, &s->ex_data)) | 2938 | &ret->ex_data, &s->ex_data)) |
| @@ -3488,7 +3486,7 @@ LSSL_ALIAS(SSL_set_msg_callback); | |||
| 3488 | void | 3486 | void |
| 3489 | SSL_set_debug(SSL *s, int debug) | 3487 | SSL_set_debug(SSL *s, int debug) |
| 3490 | { | 3488 | { |
| 3491 | s->debug = debug; | 3489 | SSLerror(s, ERR_R_DISABLED); |
| 3492 | } | 3490 | } |
| 3493 | LSSL_ALIAS(SSL_set_debug); | 3491 | LSSL_ALIAS(SSL_set_debug); |
| 3494 | 3492 | ||
