diff options
| author |   beck <beck@openbsd.org> | 2002-05-15 02:29:01 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2002-05-15 02:29:01 +0000 |
| commit | da347917d3d3e5d3ece379d298f4e183b4828151 (patch) | |
| tree | 4667bec6fb5a5191ed165d4bf727adbb97475bcb /lib/libssl/bio_ssl.c | |
| parent | OpenSSL 0.9.7 (diff) | |
| download | wireguard-openbsd-da347917d3d3e5d3ece379d298f4e183b4828151.tar.xz wireguard-openbsd-da347917d3d3e5d3ece379d298f4e183b4828151.zip | |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'lib/libssl/bio_ssl.c')
| -rw-r--r-- | lib/libssl/bio_ssl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index d85555a7e69..467e1499470 100644 --- a/lib/libssl/bio_ssl.c +++ b/lib/libssl/bio_ssl.c @@ -206,6 +206,10 @@ static int ssl_read(BIO *b, char *out, int outl) BIO_set_retry_special(b); retry_reason=BIO_RR_SSL_X509_LOOKUP; break; + case SSL_ERROR_WANT_ACCEPT: + BIO_set_retry_special(b); + retry_reason=BIO_RR_ACCEPT; + break; case SSL_ERROR_WANT_CONNECT: BIO_set_retry_special(b); retry_reason=BIO_RR_CONNECT; @@ -482,7 +486,9 @@ static long ssl_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) { case BIO_CTRL_SET_CALLBACK: { - SSL_set_info_callback(ssl,fp); + /* FIXME: setting this via a completely different prototype + seems like a crap idea */ + SSL_set_info_callback(ssl,(void (*)(const SSL *,int,int))fp); } break; default: |