From: Matt Caswell <matt@openssl.org>
Date: Mon, 7 Nov 2016 13:44:56 +0000 (+0000)
Subject: Correct the Id for the TLS1.3 ciphersuite
X-Git-Tag: OpenSSL_1_1_1-pre1~3174
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5d71f7ea291761777a2b2a84f340ffb38b3ea14a;p=oweals%2Fopenssl.git

Correct the Id for the TLS1.3 ciphersuite

We have one TLS1.3 ciphersuite, but there is a typo in the id that should
be corrected.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 3f7e749c69..ba3c413cb0 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -601,7 +601,7 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 # define TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305           0x0300CCAE
 
 /* TLS v1.3 ciphersuites */
-# define TLS1_3_CK_AES_128_GCM_SHA256                     0x03000D01
+# define TLS1_3_CK_AES_128_GCM_SHA256                     0x03001301
 
 /*
  * XXX Backward compatibility alert: Older versions of OpenSSL gave some DHE
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index ab5d2dac76..d8ad103176 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -423,7 +423,7 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = {
     {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305"},
     {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305"},
     {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305"},
-    {0x0D01, "TLS_AES_128_GCM_SHA256"},
+    {0x1301, "TLS_AES_128_GCM_SHA256"},
     {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},
     {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},
 };