From 58966a455f1e09b34fe39931cc67a943ee315fa2 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Mon, 6 Feb 2017 11:28:10 -0500 Subject: [PATCH] Remove legacy ChaCha20-Poly1305 cipher name aliases. I believe these are now unused. Change-Id: I438da3d56ca598260fe0f5698ccb6649bd97b859 Reviewed-on: https://boringssl-review.googlesource.com/13630 Reviewed-by: Steven Valdez Reviewed-by: David Benjamin Commit-Queue: David Benjamin CQ-Verified: CQ bot account: commit-bot@chromium.org --- include/openssl/tls1.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 24edf556..26019742 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -416,11 +416,6 @@ extern "C" { #define TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 0x0300CCA9 #define TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 0x0300CCAC -/* TODO(davidben): Remove this. Historically, the CK names for CHACHA20_POLY1305 - * were missing 'WITH' and 'SHA256'. */ -#define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 \ - TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 - /* TLS 1.3 ciphersuites from draft-ietf-tls-tls13-16 */ #define TLS1_CK_AES_128_GCM_SHA256 0x03001301 #define TLS1_CK_AES_256_GCM_SHA384 0x03001302 @@ -593,11 +588,6 @@ extern "C" { #define TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 \ "ECDHE-PSK-CHACHA20-POLY1305" -/* TODO(davidben): Remove this. Historically, the TXT names for - * CHACHA20_POLY1305 were missing 'SHA256'. */ -#define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ - TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 - /* TLS 1.3 ciphersuites from draft-ietf-tls-tls13-16 */ #define TLS1_TXT_AES_128_GCM_SHA256 "AEAD-AES128-GCM-SHA256" #define TLS1_TXT_AES_256_GCM_SHA384 "AEAD-AES256-GCM-SHA384"