From fff434b2b23e8a074d741e819b9a91ddac0d4c9c Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 28 Feb 2019 17:51:19 +0000
Subject: Set the SSL state as part of tls13_legacy_connect().

Set the SSL state to SSL_ST_CONNECT during the TLSv1.3 handshake and to
SSL_ST_OK once the handshake completes, since some applications currently
rely on this information to function correctly.

ok inoguchi@ tb@
---
 src/lib/libssl/tls13_client.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index 728d1a00c8..56faf3f5d4 100644
--- a/src/lib/libssl/tls13_client.c
+++ b/src/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_client.c,v 1.12 2019/02/25 16:46:17 jsing Exp $ */
+/* $OpenBSD: tls13_client.c,v 1.13 2019/02/28 17:51:19 jsing Exp $ */
 /*
  * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -79,7 +79,10 @@ tls13_legacy_connect(SSL *ssl)
 		}
 	}
 
-	ret = tls13_connect(ctx);
+	S3I(ssl)->hs.state = SSL_ST_CONNECT;
+
+	if ((ret = tls13_connect(ctx)) == TLS13_IO_SUCCESS)
+		S3I(ssl)->hs.state = SSL_ST_OK;
 
 	return tls13_legacy_return_code(ssl, ret);
 }
-- 
cgit v1.2.3-55-g6feb