Add CECPQ1 ciphers to the cipher suites table.

net/ssl/ssl_cipher_suite_names_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_cipher_suite_names.h"
 
 #include "base/macros.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 TEST(CipherSuiteNamesTest, Basic) {
   const char *key_exchange, *cipher, *mac;
   bool is_aead;
 
@@ skipping 113 matching lines @@
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcc13 /* ECDHE_RSA_WITH_CHACHA20_POLY1305 (non-standard) */));
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcc14 /* ECDHE_ECDSA_WITH_CHACHA20_POLY1305 (non-standard) */));
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcca8 /* ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 */));
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcca9 /* ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 */));
 }
 
+TEST(CipherSuiteNamesTest, CECPQ1) {
+  const std::vector<uint16_t> kCECPQ1CipherSuites = {0x16b7, 0x16b8, 0x16b9,
+                                                     0x16ba};

[mab, 2016/05/26 21:14:57]

Using a loop seems inconsistent with the prevailing style in this file.  I don't
care; just a nit.

[agl, 2016/05/26 23:26:08]

Indeed, but I don't like the duplication here :)

+  const char *key_exchange, *cipher, *mac;
+  bool is_aead;
+
+  for (const uint16_t cipher_suite_id : kCECPQ1CipherSuites) {
+    SCOPED_TRACE(base::StringPrintf("cipher suite %x", cipher_suite_id));
+    EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(cipher_suite_id));

[mab, 2016/05/26 21:14:58]

In the preceding stanza there is a "(non-standard)" notation that you might want
to duplicate here, somewhere.

[agl, 2016/05/26 23:26:08]

Done.

+    EXPECT_TRUE(IsSecureTLSCipherSuite(cipher_suite_id));
+    SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead,
+                            cipher_suite_id);
+    EXPECT_TRUE(is_aead);
+    EXPECT_EQ(nullptr, mac);
+  }
+
+  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 0x16b7);
+  EXPECT_STREQ("CECPQ1_RSA", key_exchange);
+  EXPECT_STREQ("CHACHA20_POLY1305", cipher);
+
+  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 0x16b8);
+  EXPECT_STREQ("CECPQ1_ECDSA", key_exchange);
+  EXPECT_STREQ("CHACHA20_POLY1305", cipher);
+
+  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 0x16b9);
+  EXPECT_STREQ("CECPQ1_RSA", key_exchange);
+  EXPECT_STREQ("AES_256_GCM", cipher);
+
+  SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 0x16ba);
+  EXPECT_STREQ("CECPQ1_ECDSA", key_exchange);
+  EXPECT_STREQ("AES_256_GCM", cipher);
+}
+
 }  // anonymous namespace
 
 }  // namespace net