Commit 8f675b6e authored by Benjamin Kaduk's avatar Benjamin Kaduk Committed by Rich Salz
Browse files

GH815: The ChaCha20/Poly1305 codepoints are official 

CCA8, CCA9, CCAA, CCAB, CCAC, CCAD, and CCAE are now present in
https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml


so remove the "as per draft-ietf-tls-chacha20-poly1305-03" note
accordingly.

Signed-off-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 817cd0d5

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2808,7 +2808,7 @@ static const SSL_CIPHER ssl3_ciphers[] = { 
     },

#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)

# ifndef OPENSSL_NO_EC

    /* Cipher CCA8 as per draft-ietf-tls-chacha20-poly1305-03 */

    /* Cipher CCA8 */

    {

     1,

     TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305,