From 58c2c3280b1c2071755cc36cca7828403e544131 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 16 May 2020 18:00:29 +0000
Subject: Return TLS13_IO_WANT_POLLIN after processing post-handshake messages.

After post-handshake handshake messages have been processed, we need to
return TLS13_IO_WANT_POLLIN rather than TLS13_IO_WANT_RETRY. The latter
will cause us to try to read another TLS record, when there may not be
any data available - this will then block in the case of a blocking read.

This reverts part of r1.25.

Issue noticed by inoguchi@

ok beck@ tb@
---
 src/lib/libssl/tls13_record_layer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/tls13_record_layer.c b/src/lib/libssl/tls13_record_layer.c
index ab006b3b1a..e6983d5892 100644
--- a/src/lib/libssl/tls13_record_layer.c
+++ b/src/lib/libssl/tls13_record_layer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_record_layer.c,v 1.42 2020/05/13 17:54:26 jsing Exp $ */
+/* $OpenBSD: tls13_record_layer.c,v 1.43 2020/05/16 18:00:29 jsing Exp $ */
 /*
  * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -931,7 +931,7 @@ tls13_record_layer_read_internal(struct tls13_record_layer *rl,
 				rl->phh = 0;
 
 				if (ret == TLS13_IO_SUCCESS)
-					return TLS13_IO_WANT_RETRY;
+					return TLS13_IO_WANT_POLLIN;
 
 				return ret;
 			}
-- 
cgit v1.2.3-55-g6feb