diff options
| author |   jsing <jsing@openbsd.org> | 2018-08-30 16:56:16 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-08-30 16:56:16 +0000 |
| commit | 364ba4a4e82c3433ff7ff4a1b8ceb7c4d2c54e72 (patch) | |
| tree | 65361084b199876ada72750241b2765abae350ab /lib/libssl/ssl_lib.c | |
| parent | Move .dynstr before _edata to fix image size calculation. The PE (diff) | |
| download | wireguard-openbsd-364ba4a4e82c3433ff7ff4a1b8ceb7c4d2c54e72.tar.xz wireguard-openbsd-364ba4a4e82c3433ff7ff4a1b8ceb7c4d2c54e72.zip | |
Nuke ssl_pending/ssl_shutdown function pointers.
ssl3_pending() is used for all protocols and dtls1_shutdown() just calls
ssl3_shutdown(), so just call the appropriate function directly instead.
ok beck@ inoguchi@ tb@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 0dbc7b37071..938139e18ed 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.186 2018/08/24 20:30:21 tb Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.187 2018/08/30 16:56:16 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -809,7 +809,7 @@ SSL_pending(const SSL *s) * (Note that SSL_pending() is often used as a boolean value, * so we'd better not return -1.) */ - return (s->method->internal->ssl_pending(s)); + return (ssl3_pending(s)); } X509 * @@ -1015,10 +1015,10 @@ SSL_shutdown(SSL *s) return (-1); } - if ((s != NULL) && !SSL_in_init(s)) - return (s->method->internal->ssl_shutdown(s)); - else - return (1); + if (s != NULL && !SSL_in_init(s)) + return (ssl3_shutdown(s)); + + return (1); } int |