From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 18 Jan 2018 06:39:45 +0000 (+0900)
Subject: Remove generation of exporter master secret on client application traffic
X-Git-Tag: OpenSSL_1_1_1-pre1~58
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1a51abb935163cbb0b0089ad9ee8ff174341bbd;p=oweals%2Fopenssl.git

Remove generation of exporter master secret on client application traffic

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

diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
index 7975be54a8..f555df54fc 100644
--- a/ssl/tls13_enc.c
+++ b/ssl/tls13_enc.c
@@ -562,16 +562,6 @@ int tls13_change_cipher_state(SSL *s, int which)
             goto err;
         }
         s->session->master_key_length = hashlen;
-
-        /* Now we create the exporter master secret */
-        if (!tls13_hkdf_expand(s, ssl_handshake_md(s), insecret,
-                               exporter_master_secret,
-                               sizeof(exporter_master_secret) - 1,
-                               hash, hashlen, s->exporter_master_secret,
-                               hashlen)) {
-            /* SSLfatal() already called */
-            goto err;
-        }
     }
 
     if (!derive_secret_key_and_iv(s, which & SSL3_CC_WRITE, md, cipher,