From 6bdc471df05dc30ed3ccf073dd75949963175c2e Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 13 Nov 2020 14:00:59 +0000
Subject: Merge branch 'client-hello-version' into 'master'

Use proper record version in client hello after hello retry request

Closes #1053

See merge request gnutls/gnutls!1346

(cherry picked from commit c93fab21ab7abb805b4db22cd155996b3ce96361)

136b6a47 Use proper record version in client hello after hello retry request
---
 lib/record.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/record.c b/lib/record.c
index af993fe6e5..faf53f5625 100644
--- a/lib/record.c
+++ b/lib/record.c
@@ -367,6 +367,7 @@ copy_record_version(gnutls_session_t session,
 	lver = get_version(session);
 	if (session->internals.initial_negotiation_completed ||
 	    htype != GNUTLS_HANDSHAKE_CLIENT_HELLO ||
+	    (session->internals.hsk_flags & HSK_HRR_RECEIVED) ||
 	    session->internals.default_record_version[0] == 0) {
 
 		if (unlikely(lver == NULL))
-- 
cgit v1.2.1