summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2020-05-20 14:58:33 +0000
committerbeck <>2020-05-20 14:58:33 +0000
commit76628e0ca0bd7284bfab6686ab3255b9f86ec5c3 (patch)
tree1b61d042d0aa9cf6e45f2c78eb804fa85d738a77 /src
parent3977f4b629887520fc62e33d81cb50861404b57f (diff)
downloadopenbsd-76628e0ca0bd7284bfab6686ab3255b9f86ec5c3.tar.gz
openbsd-76628e0ca0bd7284bfab6686ab3255b9f86ec5c3.tar.bz2
openbsd-76628e0ca0bd7284bfab6686ab3255b9f86ec5c3.zip
Revert 1.43 - this fix for PHH in blocking mode breaks SSL_accept and
SSL_connect in blocking mode. While this will probably need a rethink, until we land on a solution for PHH in blocking mode, the breakage this causes is visible in real things, and we've only managed to hit the PHH breakage in a test case. ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/tls13_record_layer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/tls13_record_layer.c b/src/lib/libssl/tls13_record_layer.c
index e6983d5892..2188d517a8 100644
--- a/src/lib/libssl/tls13_record_layer.c
+++ b/src/lib/libssl/tls13_record_layer.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_record_layer.c,v 1.43 2020/05/16 18:00:29 jsing Exp $ */ 1/* $OpenBSD: tls13_record_layer.c,v 1.44 2020/05/20 14:58:33 beck 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 *
@@ -931,7 +931,7 @@ tls13_record_layer_read_internal(struct tls13_record_layer *rl,
931 rl->phh = 0; 931 rl->phh = 0;
932 932
933 if (ret == TLS13_IO_SUCCESS) 933 if (ret == TLS13_IO_SUCCESS)
934 return TLS13_IO_WANT_POLLIN; 934 return TLS13_IO_WANT_RETRY;
935 935
936 return ret; 936 return ret;
937 } 937 }