From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 26 Aug 2020 15:42:21 +0000 (+0200)
Subject: tls-socket: Don't fail reading if sending data failed
X-Git-Tag: 5.9.2rc1~23^2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09fbaad6bd712b5480d9c1d8a9bfa766171b783d;p=thirdparty%2Fstrongswan.git

tls-socket: Don't fail reading if sending data failed

If data is processed that eventually includes a TLS close notify, build()
will fail after a close notify has been sent in turn.  However, propagating
that error immediately when reading prevented ever returning the data
already processed before the close notify was received.
---

diff --git a/src/libtls/tls_socket.c b/src/libtls/tls_socket.c
index f29a369f14..7745988fb6 100644
--- a/src/libtls/tls_socket.c
+++ b/src/libtls/tls_socket.c
@@ -188,7 +188,11 @@ static bool exchange(private_tls_socket_t *this, bool wr, bool block)
 				case SUCCESS:
 					return TRUE;
 				default:
-					return FALSE;
+					if (wr)
+					{
+						return FALSE;
+					}
+					break;
 			}
 			break;
 		}