diff options
author | jsing <> | 2021-07-01 17:53:39 +0000 |
---|---|---|
committer | jsing <> | 2021-07-01 17:53:39 +0000 |
commit | a0afc1b4032278e02db285a67fa2e295e9970176 (patch) | |
tree | 57d97f559edf3211313bbaee593ec7483ded13e4 /src/lib/libssl/bio_ssl.c | |
parent | bd1a6cca8085312ddc750a73ac51cba9231bfcf6 (diff) | |
download | openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.tar.gz openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.tar.bz2 openbsd-a0afc1b4032278e02db285a67fa2e295e9970176.zip |
Merge SSL_METHOD_INTERNAL into SSL_METHOD.
Now that SSL_METHOD is opaque and in internal headers, we can remove
SSL_METHOD_INTERNAL by merging it back into SSL_METHOD.
ok 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 460b09fd87..bb40b2a6f7 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.30 2021/06/11 11:13:53 jsing Exp $ */ | 1 | /* $OpenBSD: bio_ssl.c,v 1.31 2021/07/01 17:53:39 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 | SSL_shutdown(ssl); | 294 | SSL_shutdown(ssl); |
295 | 295 | ||
296 | if (ssl->internal->handshake_func == | 296 | if (ssl->internal->handshake_func == |
297 | ssl->method->internal->ssl_connect) | 297 | ssl->method->ssl_connect) |
298 | SSL_set_connect_state(ssl); | 298 | SSL_set_connect_state(ssl); |
299 | else if (ssl->internal->handshake_func == | 299 | else if (ssl->internal->handshake_func == |
300 | ssl->method->internal->ssl_accept) | 300 | ssl->method->ssl_accept) |
301 | SSL_set_accept_state(ssl); | 301 | SSL_set_accept_state(ssl); |
302 | 302 | ||
303 | SSL_clear(ssl); | 303 | SSL_clear(ssl); |