generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GH815: The ChaCha20/Poly1305 codepoints are official

Browse Source 
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: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Benjamin Kaduk 2016-03-07 18:00:03 -06:00 committed by Rich Salz
parent 817cd0d52f
commit 8f675b6e98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/s3_lib.c
View File

@ -2808,7 +2808,7 @@ static const SSL_CIPHER ssl3_ciphers[] = {
}, },
#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
# ifndef OPENSSL_NO_EC # ifndef OPENSSL_NO_EC
/* Cipher CCA8 as per draft-ietf-tls-chacha20-poly1305-03 */ /* Cipher CCA8 */
{ {
1, 1,
TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305,