diff options
| author | beck <> | 2017-01-23 04:55:27 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-23 04:55:27 +0000 |
| commit | 98459d42c7a847e84cc12f2d7df5e16e0f44839c (patch) | |
| tree | 7b3e30aaa4ce396a0dcc28cc981628a669ff50d2 /src/lib/libssl/bio_ssl.c | |
| parent | 779cc82ab96e48a0162ed5caa96bbc04dd3a5c72 (diff) | |
| download | openbsd-98459d42c7a847e84cc12f2d7df5e16e0f44839c.tar.gz openbsd-98459d42c7a847e84cc12f2d7df5e16e0f44839c.tar.bz2 openbsd-98459d42c7a847e84cc12f2d7df5e16e0f44839c.zip | |
move the callbacks from ssl_st to internal
ok jsing@
Diffstat (limited to 'src/lib/libssl/bio_ssl.c')
| -rw-r--r-- | src/lib/libssl/bio_ssl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c index 6ddbb008e6..42f637a78f 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.22 2015/09/29 18:08:57 deraadt Exp $ */ | 1 | /* $OpenBSD: bio_ssl.c,v 1.23 2017/01/23 04:55:26 beck 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 | * |
| @@ -66,6 +66,8 @@ | |||
| 66 | #include <openssl/err.h> | 66 | #include <openssl/err.h> |
| 67 | #include <openssl/ssl.h> | 67 | #include <openssl/ssl.h> |
| 68 | 68 | ||
| 69 | #include "ssl_locl.h" | ||
| 70 | |||
| 69 | static int ssl_write(BIO *h, const char *buf, int num); | 71 | static int ssl_write(BIO *h, const char *buf, int num); |
| 70 | static int ssl_read(BIO *h, char *buf, int size); | 72 | static int ssl_read(BIO *h, char *buf, int size); |
| 71 | static int ssl_puts(BIO *h, const char *str); | 73 | static int ssl_puts(BIO *h, const char *str); |
| @@ -291,9 +293,9 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 291 | case BIO_CTRL_RESET: | 293 | case BIO_CTRL_RESET: |
| 292 | SSL_shutdown(ssl); | 294 | SSL_shutdown(ssl); |
| 293 | 295 | ||
| 294 | if (ssl->handshake_func == ssl->method->ssl_connect) | 296 | if (ssl->internal->handshake_func == ssl->method->ssl_connect) |
| 295 | SSL_set_connect_state(ssl); | 297 | SSL_set_connect_state(ssl); |
| 296 | else if (ssl->handshake_func == ssl->method->ssl_accept) | 298 | else if (ssl->internal->handshake_func == ssl->method->ssl_accept) |
| 297 | SSL_set_accept_state(ssl); | 299 | SSL_set_accept_state(ssl); |
| 298 | 300 | ||
| 299 | SSL_clear(ssl); | 301 | SSL_clear(ssl); |
