This made sense when the cipher might have been standardized as-is, so a DHE_RSA variant could appease the IETF. Since the standardized variant is going to have some nonce tweaks anyway, there's no sense in keeping this around. Get rid of one non-standard cipher suite value early. (Even if they were to be standardized as-is, it's not clear we should implement new DHE cipher suites at this point.) Chrome UMA, unsurprisingly, shows that it's unused. Change-Id: Id83d73a4294b470ec2e94d5308fba135d6eeb228 Reviewed-on: https://boringssl-review.googlesource.com/5750 Reviewed-by: Adam Langley <agl@google.com>kris/onging/CECPQ3_patch15
@@ -472,7 +472,6 @@ OPENSSL_EXPORT int SSL_CTX_set_tlsext_servername_arg(SSL_CTX *ctx, void *arg); | |||||
#define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 0x0300CC13 | #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 0x0300CC13 | ||||
#define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 | #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 0x0300CC14 | ||||
#define TLS1_CK_DHE_RSA_CHACHA20_POLY1305 0x0300CC15 | |||||
/* XXX | /* XXX | ||||
* Inconsistency alert: | * Inconsistency alert: | ||||
@@ -457,14 +457,6 @@ const SSL_CIPHER kCiphers[] = { | |||||
SSL_HANDSHAKE_MAC_SHA256, | SSL_HANDSHAKE_MAC_SHA256, | ||||
256, 0, | 256, 0, | ||||
}, | }, | ||||
{ | |||||
TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305, | |||||
TLS1_CK_DHE_RSA_CHACHA20_POLY1305, SSL_kDHE, SSL_aRSA, | |||||
SSL_CHACHA20POLY1305, SSL_AEAD, SSL_TLSV1_2, SSL_HIGH, | |||||
SSL_HANDSHAKE_MAC_SHA256, | |||||
256, 0, | |||||
}, | |||||
}; | }; | ||||
static const size_t kCiphersLen = sizeof(kCiphers) / sizeof(kCiphers[0]); | static const size_t kCiphersLen = sizeof(kCiphers) / sizeof(kCiphers[0]); | ||||
@@ -102,7 +102,6 @@ var cipherSuites = []*cipherSuite{ | |||||
{TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, 32, 48, 16, ecdheECDSAKA, suiteECDHE | suiteECDSA | suiteTLS12 | suiteSHA384, cipherAES, macSHA384, nil}, | {TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384, 32, 48, 16, ecdheECDSAKA, suiteECDHE | suiteECDSA | suiteTLS12 | suiteSHA384, cipherAES, macSHA384, nil}, | ||||
{TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 32, 20, 16, ecdheRSAKA, suiteECDHE, cipherAES, macSHA1, nil}, | {TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, 32, 20, 16, ecdheRSAKA, suiteECDHE, cipherAES, macSHA1, nil}, | ||||
{TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 32, 20, 16, ecdheECDSAKA, suiteECDHE | suiteECDSA, cipherAES, macSHA1, nil}, | {TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, 32, 20, 16, ecdheECDSAKA, suiteECDHE | suiteECDSA, cipherAES, macSHA1, nil}, | ||||
{TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256, 32, 0, 0, dheRSAKA, suiteTLS12, nil, nil, aeadCHACHA20POLY1305}, | |||||
{TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, 16, 0, 4, dheRSAKA, suiteTLS12, nil, nil, aeadAESGCM}, | {TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, 16, 0, 4, dheRSAKA, suiteTLS12, nil, nil, aeadAESGCM}, | ||||
{TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, 32, 0, 4, dheRSAKA, suiteTLS12 | suiteSHA384, nil, nil, aeadAESGCM}, | {TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, 32, 0, 4, dheRSAKA, suiteTLS12 | suiteSHA384, nil, nil, aeadAESGCM}, | ||||
{TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, 16, 32, 16, dheRSAKA, suiteTLS12, cipherAES, macSHA256, nil}, | {TLS_DHE_RSA_WITH_AES_128_CBC_SHA256, 16, 32, 16, dheRSAKA, suiteTLS12, cipherAES, macSHA256, nil}, | ||||
@@ -415,5 +414,4 @@ const ( | |||||
TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256 uint16 = 0xcafe | TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256 uint16 = 0xcafe | ||||
TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcc13 | TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcc13 | ||||
TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcc14 | TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcc14 | ||||
TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 uint16 = 0xcc15 | |||||
) | ) |
@@ -727,7 +727,6 @@ var testCipherSuites = []struct { | |||||
{"DHE-RSA-AES256-GCM", TLS_DHE_RSA_WITH_AES_256_GCM_SHA384}, | {"DHE-RSA-AES256-GCM", TLS_DHE_RSA_WITH_AES_256_GCM_SHA384}, | ||||
{"DHE-RSA-AES256-SHA", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, | {"DHE-RSA-AES256-SHA", TLS_DHE_RSA_WITH_AES_256_CBC_SHA}, | ||||
{"DHE-RSA-AES256-SHA256", TLS_DHE_RSA_WITH_AES_256_CBC_SHA256}, | {"DHE-RSA-AES256-SHA256", TLS_DHE_RSA_WITH_AES_256_CBC_SHA256}, | ||||
{"DHE-RSA-CHACHA20-POLY1305", TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256}, | |||||
{"ECDHE-ECDSA-AES128-GCM", TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256}, | {"ECDHE-ECDSA-AES128-GCM", TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256}, | ||||
{"ECDHE-ECDSA-AES128-SHA", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, | {"ECDHE-ECDSA-AES128-SHA", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA}, | ||||
{"ECDHE-ECDSA-AES128-SHA256", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256}, | {"ECDHE-ECDSA-AES128-SHA256", TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256}, | ||||
@@ -2350,8 +2349,8 @@ func addStateMachineCoverageTests(async, splitHandshake bool, protocol protocol) | |||||
}) | }) | ||||
tests = append(tests, testCase{ | tests = append(tests, testCase{ | ||||
testType: serverTest, | |||||
name: "OCSPStapling-Server", | |||||
testType: serverTest, | |||||
name: "OCSPStapling-Server", | |||||
expectedOCSPResponse: testOCSPResponse, | expectedOCSPResponse: testOCSPResponse, | ||||
flags: []string{ | flags: []string{ | ||||
"-ocsp-response", | "-ocsp-response", | ||||