Commit ca9e4d7a authored by David Benjamin's avatar David Benjamin Committed by Matt Caswell
Browse files

Fix the names of ChaCha20-Poly1305 cipher suites in t1_trce.c. 



Per RFC 7905, the cipher suite names end in "_SHA256". The original
implementation targeted the -03 draft, but there was a -04 draft right
before the RFC was published to make the names consistent.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3748)

(cherry picked from commit 32bbf777)
parent 2f4a4df6

ssl/t1_trce.c

+7 −7
Original line number Diff line number Diff line
@@ -415,13 +415,13 @@ static ssl_trace_tbl ssl_ciphers_tbl[] = { 
    {0xC0AD, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"},

    {0xC0AE, "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"},

    {0xC0AF, "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"},

    {0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305"},

    {0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305"},

    {0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305"},

    {0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305"},

    {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305"},

    {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305"},

    {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305"},

    {0xCCA8, "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCA9, "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCAA, "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCAB, "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCAC, "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCAD, "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"},

    {0xCCAE, "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"},

    {0xFEFE, "SSL_RSA_FIPS_WITH_DES_CBC_SHA"},

    {0xFEFF, "SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA"},

};