diff options
author | jsing <> | 2022-10-02 16:36:42 +0000 |
---|---|---|
committer | jsing <> | 2022-10-02 16:36:42 +0000 |
commit | 7a087580717329de5ef02600e4e1489d86249a88 (patch) | |
tree | 739f174130582d68ff159ff94cdb3fb2185e31ef /src/lib/libssl/bio_ssl.c | |
parent | d5e660940f76ba9fedb2400c0fa888e996ee93c9 (diff) | |
download | openbsd-7a087580717329de5ef02600e4e1489d86249a88.tar.gz openbsd-7a087580717329de5ef02600e4e1489d86249a88.tar.bz2 openbsd-7a087580717329de5ef02600e4e1489d86249a88.zip |
Get rid of SSL_CTX_INTERNAL and SSL_INTERNAL.
These are no longer necessary due to SSL_CTX and SSL now being fully
opaque. Merge SSL_CTX_INTERNAL back into SSL_CTX and SSL_INTERNAL back
into SSL.
Prompted by tb@
Diffstat (limited to 'src/lib/libssl/bio_ssl.c')
-rw-r--r-- | src/lib/libssl/bio_ssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index e86b9d83f2..e78bbc1851 100644 --- a/src/lib/libssl/bio_ssl.c +++ b/src/lib/libssl/bio_ssl.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio_ssl.c,v 1.33 2022/01/14 09:12:53 tb Exp $ */ | 1 | /* $OpenBSD: bio_ssl.c,v 1.34 2022/10/02 16:36:41 jsing 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 | * |
@@ -294,10 +294,10 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
294 | case BIO_CTRL_RESET: | 294 | case BIO_CTRL_RESET: |
295 | SSL_shutdown(ssl); | 295 | SSL_shutdown(ssl); |
296 | 296 | ||
297 | if (ssl->internal->handshake_func == | 297 | if (ssl->handshake_func == |
298 | ssl->method->ssl_connect) | 298 | ssl->method->ssl_connect) |
299 | SSL_set_connect_state(ssl); | 299 | SSL_set_connect_state(ssl); |
300 | else if (ssl->internal->handshake_func == | 300 | else if (ssl->handshake_func == |
301 | ssl->method->ssl_accept) | 301 | ssl->method->ssl_accept) |
302 | SSL_set_accept_state(ssl); | 302 | SSL_set_accept_state(ssl); |
303 | 303 | ||