diff options
| author |   beck <beck@openbsd.org> | 2017-01-26 12:44:52 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2017-01-26 12:44:52 +0000 |
| commit | f374266782d5fd0c77c026c6e01382c93fa773bc (patch) | |
| tree | 5c127678b47a736e2acb929114c05e4937a42138 /lib/libssl/bio_ssl.c | |
| parent | Convert ssl3_get_client_hello() to CBS. (diff) | |
| download | wireguard-openbsd-f374266782d5fd0c77c026c6e01382c93fa773bc.tar.xz wireguard-openbsd-f374266782d5fd0c77c026c6e01382c93fa773bc.zip | |
knf
Diffstat (limited to 'lib/libssl/bio_ssl.c')
| -rw-r--r-- | lib/libssl/bio_ssl.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/libssl/bio_ssl.c b/lib/libssl/bio_ssl.c index 81b42b1a4f3..46c08a17989 100644 --- a/lib/libssl/bio_ssl.c +++ b/lib/libssl/bio_ssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_ssl.c,v 1.24 2017/01/23 13:36:12 jsing Exp $ */ +/* $OpenBSD: bio_ssl.c,v 1.25 2017/01/26 12:44:52 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -293,9 +293,11 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_RESET: SSL_shutdown(ssl); - if (ssl->internal->handshake_func == ssl->method->internal->ssl_connect) + if (ssl->internal->handshake_func == + ssl->method->internal->ssl_connect) SSL_set_connect_state(ssl); - else if (ssl->internal->handshake_func == ssl->method->internal->ssl_accept) + else if (ssl->internal->handshake_func == + ssl->method->internal->ssl_accept) SSL_set_accept_state(ssl); SSL_clear(ssl); @@ -378,7 +380,8 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_PUSH: if ((b->next_bio != NULL) && (b->next_bio != ssl->rbio)) { SSL_set_bio(ssl, b->next_bio, b->next_bio); - CRYPTO_add(&b->next_bio->references, 1, CRYPTO_LOCK_BIO); + CRYPTO_add(&b->next_bio->references, 1, + CRYPTO_LOCK_BIO); } break; case BIO_CTRL_POP: @@ -446,7 +449,8 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr) { void (**fptr)(const SSL *xssl, int type, int val); - fptr = (void (**)(const SSL *xssl, int type, int val))ptr; + fptr = (void (**)(const SSL *xssl, int type, int val)) + ptr; *fptr = SSL_get_info_callback(ssl); } break; @@ -471,7 +475,8 @@ ssl_callback_ctrl(BIO *b, int cmd, bio_info_cb *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); + SSL_set_info_callback(ssl, + (void (*)(const SSL *, int, int))fp); } break; default: |