[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  5d71f7ea291761777a2b2a84f340ffb38b3ea14a (commit)
      from  c437757466e7bef632b26eaaf429a9e693330999 (commit)


- Log -----------------------------------------------------------------
commit 5d71f7ea291761777a2b2a84f340ffb38b3ea14a
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Nov 7 13:44:56 2016 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/tls1.h | 2 +-
 ssl/t1_trce.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 3f7e749..ba3c413 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 ab5d2da..d8ad103 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"},
 };