From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 20 Apr 2018 07:01:28 +0000 (+0200)
Subject: handshake: cleanup in TLS1.3 initial secret calculation
X-Git-Tag: gnutls_3_6_3~163^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76771233e349feb3c0acfe134effca06fd291be0;p=thirdparty%2Fgnutls.git

handshake: cleanup in TLS1.3 initial secret calculation

That eliminates duplicate code in server hello parsing.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/lib/handshake.c b/lib/handshake.c
index a530fb9a8c..18c0974ca4 100644
--- a/lib/handshake.c
+++ b/lib/handshake.c
@@ -1801,22 +1801,10 @@ read_server_hello(gnutls_session_t session,
 	if (*comp_pos != 0)
 		return gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);
 
-	if (vers->tls13_sem) {
-		/* TLS 1.3 Early Secret */
-		ret = _tls13_init_secret(session, NULL, 0);
-		if (ret < 0)
-			return gnutls_assert_val(ret);
-
-		ret = _tls13_derive_secret(session, DERIVED_LABEL, sizeof(DERIVED_LABEL)-1,
-					   NULL, 0, session->key.proto.tls13.temp_secret,
-					   session->key.proto.tls13.temp_secret);
-		if (ret < 0)
-			return gnutls_assert_val(ret);
-
+	if (vers->tls13_sem)
 		ext_parse_flag |= GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO;
-	} else {
+	else
 		ext_parse_flag |= GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO;
-	}
 
 	/* Parse extensions in order.
 	 */
@@ -1852,8 +1840,8 @@ read_server_hello(gnutls_session_t session,
 	if (ret < 0)
 		return gnutls_assert_val(ret);
 
+	/* Calculate TLS 1.3 Early Secret */
 	if (vers->tls13_sem) {
-		/* TLS 1.3 Early Secret */
 		if (session->internals.hsk_flags & HSK_PSK_SELECTED) {
 			psk = session->key.psk.data;
 			psk_size = session->key.psk.size;