From: Matt Caswell <matt@openssl.org>
Date: Fri, 13 Jan 2017 13:49:44 +0000 (+0000)
Subject: Never send a session id in TLS1.3
X-Git-Tag: OpenSSL_1_1_1-pre1~2575
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f05bcf0f4581664f429154cdb689faef242cf843;p=oweals%2Fopenssl.git

Never send a session id in TLS1.3

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

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 45177ece20..d5d622c1c5 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1003,7 +1003,7 @@ int tls_construct_client_hello(SSL *s, WPACKET *pkt)
     }
 
     /* Session ID */
-    if (s->new_session)
+    if (s->new_session || s->session->ssl_version == TLS1_3_VERSION)
         sess_id_len = 0;
     else
         sess_id_len = s->session->session_id_length;