From: Matt Caswell <matt@openssl.org>
Date: Mon, 13 Nov 2017 15:01:07 +0000 (+0000)
Subject: Make sure supported_versions appears in an HRR too
X-Git-Tag: OpenSSL_1_1_1-pre1~284
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e7dd763e513f576b8e4e32bb5d08abc37bb08a40;p=oweals%2Fopenssl.git

Make sure supported_versions appears in an HRR too

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
---

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 026126d4d8..28f7ada55a 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -263,7 +263,8 @@ static const EXTENSION_DEFINITION ext_defs[] = {
     {
         TLSEXT_TYPE_supported_versions,
         SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
-        | SSL_EXT_TLS1_3_SERVER_HELLO | SSL_EXT_TLS_IMPLEMENTATION_ONLY,
+        | SSL_EXT_TLS1_3_SERVER_HELLO | SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST
+        | SSL_EXT_TLS_IMPLEMENTATION_ONLY,
         NULL,
         /* Processed inline as part of version selection */
         NULL, tls_parse_stoc_supported_versions,