diff options
| author |   jsing <jsing@openbsd.org> | 2020-01-23 03:17:40 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-01-23 03:17:40 +0000 |
| commit | 8dc90bba8e974cb04a5df610612ea39231af0ebe (patch) | |
| tree | 17a2c3bc101d8715c75eface46b3bc8ecd2fdf93 /lib/libssl/ssl_lib.c | |
| parent | remove PIPEX from tun(4) now that pppac(4) should be used instead. (diff) | |
| download | wireguard-openbsd-8dc90bba8e974cb04a5df610612ea39231af0ebe.tar.xz wireguard-openbsd-8dc90bba8e974cb04a5df610612ea39231af0ebe.zip | |
Switch back to a function pointer for ssl_pending.
This will allow the TLSv1.3 stack to provide its own implementation. Nuke
a completely bogus comment from SSL_pending() whilst here.
ok beck@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index a667b5d2945..1b141b6e2c1 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.208 2020/01/21 04:45:18 tb Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.209 2020/01/23 03:17:40 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -802,15 +802,7 @@ SSL_get_read_ahead(const SSL *s) int SSL_pending(const SSL *s) { - /* - * SSL_pending cannot work properly if read-ahead is enabled - * (SSL_[CTX_]ctrl(..., SSL_CTRL_SET_READ_AHEAD, 1, NULL)), - * and it is impossible to fix since SSL_pending cannot report - * errors that may be observed while scanning the new data. - * (Note that SSL_pending() is often used as a boolean value, - * so we'd better not return -1.) - */ - return (ssl3_pending(s)); + return (s->method->internal->ssl_pending(s)); } X509 * |