[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  8f675b6e98087d5be05cc3ceb9af97cae18bd3e5 (commit)
      from  817cd0d52f0462039d1fe60462150be7f59d2002 (commit)


- Log -----------------------------------------------------------------
commit 8f675b6e98087d5be05cc3ceb9af97cae18bd3e5
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Mon Mar 7 18:00:03 2016 -0600

    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 at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/s3_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 134c7e6..51fb161 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,