diff options
| author |   beck <beck@openbsd.org> | 2017-01-23 04:55:26 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-23 04:55:26 +0000 |
| commit | ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5 (patch) | |
| tree | fbfc6a21044c98cf1a52af33a8eb920ba55fccb8 /lib/libssl/bio_ssl.c | |
| parent | Call isatty() before tcgetattr() in the lex. This is a little redundant, (diff) | |
| download | wireguard-openbsd-ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5.tar.xz wireguard-openbsd-ff2362174b425eaa5de48bc9c2ce3dd4e81e84c5.zip | |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'lib/libssl/bio_ssl.c')
| -rw-r--r-- | lib/libssl/bio_ssl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index 6ddbb008e6a..42f637a78ff 100644 --- a/lib/libssl/bio_ssl.c +++ b/lib/libssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.22 2015/09/29 18:08:57 deraadt Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.23 2017/01/23 04:55:26 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,6 +66,8 @@ #include <openssl/err.h> #include <openssl/ssl.h> +#include "ssl_locl.h" + static int ssl_write(BIO *h, const char *buf, int num); static int ssl_read(BIO *h, char *buf, int size); static int ssl_puts(BIO *h, const char *str); @@ -291,9 +293,9 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_RESET: SSL_shutdown(ssl); - if (ssl->handshake_func == ssl->method->ssl_connect) + if (ssl->internal->handshake_func == ssl->method->ssl_connect) SSL_set_connect_state(ssl); - else if (ssl->handshake_func == ssl->method->ssl_accept) + else if (ssl->internal->handshake_func == ssl->method->ssl_accept) SSL_set_accept_state(ssl); SSL_clear(ssl); |