From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Tue, 8 Mar 2016 00:00:03 +0000 (-0600)
Subject: GH815: The ChaCha20/Poly1305 codepoints are official
X-Git-Tag: OpenSSL_1_1_0-pre4~254
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8f675b6e98087d5be05cc3ceb9af97cae18bd3e5;p=oweals%2Fopenssl.git

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: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 134c7e636c..51fb161dd6 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -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,