From: Matt Caswell <matt@openssl.org>
Date: Mon, 8 May 2017 15:51:47 +0000 (+0100)
Subject: Don't do the final key_share checks if we are in an HRR
X-Git-Tag: OpenSSL_1_1_1-pre1~1558
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=07d447a6fcd02bbccca9f7bd139cf0554fedf48c

Don't do the final key_share checks if we are in an HRR

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3414)
---

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 8984577d4f..9b16014f7b 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1058,6 +1058,10 @@ static int final_key_share(SSL *s, unsigned int context, int sent, int *al)
     if (!SSL_IS_TLS13(s))
         return 1;
 
+    /* Nothing to do for key_share in an HRR */
+    if ((context & SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST) != 0)
+        return 1;
+
     /*
      * If
      *     we are a client