diff options
author | jsing <> | 2020-01-23 03:17:40 +0000 |
---|---|---|
committer | jsing <> | 2020-01-23 03:17:40 +0000 |
commit | 7ecf22796e9d8d8a9545f50ff1753233a503eccc (patch) | |
tree | 0ef2c65adc26f279aea716841857cfd27cc33036 /src/lib/libssl/ssl_lib.c | |
parent | 7f4d6ebbe0ac3623241a9fb8708f7186d0687cff (diff) | |
download | openbsd-7ecf22796e9d8d8a9545f50ff1753233a503eccc.tar.gz openbsd-7ecf22796e9d8d8a9545f50ff1753233a503eccc.tar.bz2 openbsd-7ecf22796e9d8d8a9545f50ff1753233a503eccc.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 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index a667b5d294..1b141b6e2c 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_lib.c,v 1.208 2020/01/21 04:45:18 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.209 2020/01/23 03:17:40 jsing 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 | * |
@@ -802,15 +802,7 @@ SSL_get_read_ahead(const SSL *s) | |||
802 | int | 802 | int |
803 | SSL_pending(const SSL *s) | 803 | SSL_pending(const SSL *s) |
804 | { | 804 | { |
805 | /* | 805 | return (s->method->internal->ssl_pending(s)); |
806 | * SSL_pending cannot work properly if read-ahead is enabled | ||
807 | * (SSL_[CTX_]ctrl(..., SSL_CTRL_SET_READ_AHEAD, 1, NULL)), | ||
808 | * and it is impossible to fix since SSL_pending cannot report | ||
809 | * errors that may be observed while scanning the new data. | ||
810 | * (Note that SSL_pending() is often used as a boolean value, | ||
811 | * so we'd better not return -1.) | ||
812 | */ | ||
813 | return (ssl3_pending(s)); | ||
814 | } | 806 | } |
815 | 807 | ||
816 | X509 * | 808 | X509 * |