summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-02-26 17:36:30 +0000
committerjsing <>2019-02-26 17:36:30 +0000
commitb6d95bd1b9a0945ebe7eb185c52462dd3b4960fb (patch)
treeb27685211d87192b8f058c5b20236e23089c6419
parent3fca1fab6088ee67b30c2f9bc54f0d9669d75296 (diff)
downloadopenbsd-b6d95bd1b9a0945ebe7eb185c52462dd3b4960fb.tar.gz
openbsd-b6d95bd1b9a0945ebe7eb185c52462dd3b4960fb.tar.bz2
openbsd-b6d95bd1b9a0945ebe7eb185c52462dd3b4960fb.zip
Correctly propagate EOF from BIO in tls13_legacy_wire_read().
ok tb@
-rw-r--r--src/lib/libssl/tls13_lib.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_lib.c b/src/lib/libssl/tls13_lib.c
index d8a22c8fc7..0151395be8 100644
--- a/src/lib/libssl/tls13_lib.c
+++ b/src/lib/libssl/tls13_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_lib.c,v 1.5 2019/02/23 15:00:44 jsing Exp $ */ 1/* $OpenBSD: tls13_lib.c,v 1.6 2019/02/26 17:36:30 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -141,6 +141,8 @@ tls13_legacy_wire_read(SSL *ssl, uint8_t *buf, size_t len)
141 return TLS13_IO_WANT_POLLIN; 141 return TLS13_IO_WANT_POLLIN;
142 if (BIO_should_write(ssl->rbio)) 142 if (BIO_should_write(ssl->rbio))
143 return TLS13_IO_WANT_POLLOUT; 143 return TLS13_IO_WANT_POLLOUT;
144 if (n == 0)
145 return TLS13_IO_EOF;
144 146
145 return TLS13_IO_FAILURE; 147 return TLS13_IO_FAILURE;
146 } 148 }