Revert "Roll src/third_party/boringssl/src 0d81373f9..1991af690" (https://codereview.chromium.org/2…

net/ssl/ssl_cipher_suite_names.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 <stdlib.h>
 
 #include <openssl/ssl.h>
 
@@ skipping 111 matching lines @@
     {0xbc, 0x653},     // TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256
     {0xbd, 0x853},     // TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256
     {0xbe, 0xa53},     // TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
     {0xbf, 0xc53},     // TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256
     {0xc0, 0x15b},     // TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256
     {0xc1, 0x45b},     // TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256
     {0xc2, 0x65b},     // TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256
     {0xc3, 0x85b},     // TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256
     {0xc4, 0xa5b},     // TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256
     {0xc5, 0xc5b},     // TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256
-    {0x1301, 0x1f6f},  // TLS_AES_128_GCM_SHA256
-    {0x1302, 0x1f77},  // TLS_AES_256_GCM_SHA384
-    {0x1303, 0x1f8f},  // TLS_CHACHA20_POLY1305_SHA256
     {0x16b7, 0x128f},  // TLS_CECPQ1_RSA_WITH_CHACHA20_POLY1305_SHA256 (exper)
     {0x16b8, 0x138f},  // TLS_CECPQ1_ECDSA_WITH_CHACHA20_POLY1305_SHA256 (exper)
     {0x16b9, 0x1277},  // TLS_CECPQ1_RSA_WITH_AES_256_GCM_SHA384 (exper)
     {0x16ba, 0x1377},  // TLS_CECPQ1_ECDSA_WITH_AES_256_GCM_SHA384 (exper)
     {0xc001, 0xd02},   // TLS_ECDH_ECDSA_WITH_NULL_SHA
     {0xc002, 0xd12},   // TLS_ECDH_ECDSA_WITH_RC4_128_SHA
     {0xc003, 0xd3a},   // TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA
     {0xc004, 0xd42},   // TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA
     {0xc005, 0xd4a},   // TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA
     {0xc006, 0xe02},   // TLS_ECDHE_ECDSA_WITH_NULL_SHA
@@ skipping 57 matching lines @@
     {0xc088, 0xd7f},   // TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
     {0xc089, 0xd87},   // TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
     {0xc08a, 0x107f},  // TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256
     {0xc08b, 0x1087},  // TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384
     {0xc08c, 0xf7f},   // TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
     {0xc08d, 0xf87},   // TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
     {0xcc13, 0x108f},  // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 (non-standard)
     {0xcc14, 0x0e8f},  // TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 (non-standard)
     {0xcca8, 0x108f},  // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
     {0xcca9, 0x0e8f},  // TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
+    {0xccab, 0x148f},  // TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256
+    {0xd001, 0x146f},  // TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256
+    {0xd002, 0x1477},  // TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384
 };
 
 const struct {
   char name[15];
-} kKeyExchangeNames[20] = {
-    {"NULL"},            // 0
-    {"RSA"},             // 1
-    {"RSA_EXPORT"},      // 2
-    {"DH_DSS_EXPORT"},   // 3
-    {"DH_DSS"},          // 4
-    {"DH_RSA_EXPORT"},   // 5
-    {"DH_RSA"},          // 6
-    {"DHE_DSS_EXPORT"},  // 7
-    {"DHE_DSS"},         // 8
-    {"DHE_RSA_EXPORT"},  // 9
-    {"DHE_RSA"},         // 10
-    {"DH_anon_EXPORT"},  // 11
-    {"DH_anon"},         // 12
-    {"ECDH_ECDSA"},      // 13
-    {"ECDHE_ECDSA"},     // 14
-    {"ECDH_RSA"},        // 15
-    {"ECDHE_RSA"},       // 16
-    {"ECDH_anon"},       // 17
-    {"CECPQ1_RSA"},      // 18
-    {"CECPQ1_ECDSA"},    // 19
-    // 31 is reserved to indicate a TLS 1.3 AEAD-only suite.
+} kKeyExchangeNames[21] = {
+  {"NULL"},  // 0
+  {"RSA"},  // 1
+  {"RSA_EXPORT"},  // 2
+  {"DH_DSS_EXPORT"},  // 3
+  {"DH_DSS"},  // 4
+  {"DH_RSA_EXPORT"},  // 5
+  {"DH_RSA"},  // 6
+  {"DHE_DSS_EXPORT"},  // 7
+  {"DHE_DSS"},  // 8
+  {"DHE_RSA_EXPORT"},  // 9
+  {"DHE_RSA"},  // 10
+  {"DH_anon_EXPORT"},  // 11
+  {"DH_anon"},  // 12
+  {"ECDH_ECDSA"},  // 13
+  {"ECDHE_ECDSA"},  // 14
+  {"ECDH_RSA"},  // 15
+  {"ECDHE_RSA"},  // 16
+  {"ECDH_anon"},  // 17
+  {"CECPQ1_RSA"},  // 18
+  {"CECPQ1_ECDSA"},  // 19
+  {"ECDHE_PSK"},  // 20
 };
 
-constexpr int kTLS13KeyExchangeValue = 31;
-
 const struct {
   char name[18];
 } kCipherNames[18] = {
   {"NULL"},  // 0
   {"RC4_40"},  // 1
   {"RC4_128"},  // 2
   {"RC2_CBC_40"},  // 3
   {"IDEA_CBC"},  // 4
   {"DES40_CBC"},  // 5
   {"DES_CBC"},  // 6
@@ skipping 66 matching lines @@
   int obsolete_ssl = net::OBSOLETE_SSL_NONE;
 
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac)) {
     // Cannot determine/unknown cipher suite. Err on the side of caution.
     obsolete_ssl |= net::OBSOLETE_SSL_MASK_KEY_EXCHANGE;
     obsolete_ssl |= net::OBSOLETE_SSL_MASK_CIPHER;
     return obsolete_ssl;
   }
 
+  // Only allow ECDHE key exchanges.
   switch (key_exchange) {
     case 14:  // ECDHE_ECDSA
     case 16:  // ECDHE_RSA
     case 18:  // CECPQ1_RSA
     case 19:  // CECPQ1_ECDSA
-    case kTLS13KeyExchangeValue:  // TLS 1.3
+    case 20:  // ECDHE_PSK
       break;
     default:
       obsolete_ssl |= net::OBSOLETE_SSL_MASK_KEY_EXCHANGE;
   }
 
   switch (cipher) {
     case 13:  // AES_128_GCM
     case 14:  // AES_256_GCM
     case 17:  // CHACHA20_POLY1305
       break;
     default:
       obsolete_ssl |= net::OBSOLETE_SSL_MASK_CIPHER;
   }
 
   // Only AEADs allowed.
   if (mac != kAEADMACValue)
     obsolete_ssl |= net::OBSOLETE_SSL_MASK_CIPHER;
 
   return obsolete_ssl;
 }
 
 }  // namespace
 
 namespace net {
 
 void SSLCipherSuiteToStrings(const char** key_exchange_str,
                              const char** cipher_str,
                              const char** mac_str,
                              bool* is_aead,
-                             bool* is_tls13,
                              uint16_t cipher_suite) {
   *key_exchange_str = *cipher_str = *mac_str = "???";
   *is_aead = false;
-  *is_tls13 = false;
 
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return;
 
-  if (key_exchange == kTLS13KeyExchangeValue) {
-    *key_exchange_str = nullptr;
-    *is_tls13 = true;
-  } else {
-    *key_exchange_str = kKeyExchangeNames[key_exchange].name;
-  }
+  *key_exchange_str = kKeyExchangeNames[key_exchange].name;
   *cipher_str = kCipherNames[cipher].name;
   if (mac == kAEADMACValue) {
     *is_aead = true;
-    *mac_str = nullptr;
+    *mac_str = NULL;
   } else {
     *mac_str = kMacNames[mac].name;
   }
 }
 
 void SSLVersionToString(const char** name, int ssl_version) {
   switch (ssl_version) {
     case SSL_CONNECTION_VERSION_SSL2:
       *name = "SSL 2.0";
       break;
@@ skipping 52 matching lines @@
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return false;
 
   // Only allow forward secure key exchanges.
   switch (key_exchange) {
     case 10:  // DHE_RSA
     case 14:  // ECDHE_ECDSA
     case 16:  // ECDHE_RSA
     case 18:  // CECPQ1_RSA
     case 19:  // CECPQ1_ECDSA
-    case kTLS13KeyExchangeValue:  // TLS 1.3
+    case 20:  // ECDHE_PSK
       break;
     default:
       return false;
   }
 
   switch (cipher) {
     case 13:  // AES_128_GCM
     case 14:  // AES_256_GCM
     case 17:  // CHACHA20_POLY1305
       break;
     default:
       return false;
   }
 
   // Only AEADs allowed.
   if (mac != kAEADMACValue)
     return false;
 
   return true;
 }
 
 }  // namespace net