Adding TLS 1.3 constants

components/ssl_config/ssl_config_service_manager_pref.cc

 // Copyright (c) 2012 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 "components/ssl_config/ssl_config_service_manager.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
@@ skipping 61 matching lines @@
 // Returns the SSL protocol version (as a uint16_t) represented by a string.
 // Returns 0 if the string is invalid.
 uint16_t SSLProtocolVersionFromString(const std::string& version_str) {
   uint16_t version = 0;  // Invalid.
   if (version_str == switches::kSSLVersionTLSv1) {
     version = net::SSL_PROTOCOL_VERSION_TLS1;
   } else if (version_str == switches::kSSLVersionTLSv11) {
     version = net::SSL_PROTOCOL_VERSION_TLS1_1;
   } else if (version_str == switches::kSSLVersionTLSv12) {
     version = net::SSL_PROTOCOL_VERSION_TLS1_2;
+  } else if (version_str == switches::kSSLVersionTLSv13) {
+    version = net::SSL_PROTOCOL_VERSION_TLS1_3;
   }
   return version;
 }
 
 const base::Feature kDHECiphersFeature{
     "DHECiphers", base::FEATURE_DISABLED_BY_DEFAULT,
 };
 
 }  // namespace
 
@@ skipping 186 matching lines @@
   std::string version_min_str = ssl_version_min_.GetValue();
   std::string version_max_str = ssl_version_max_.GetValue();
   config->version_min = net::kDefaultSSLVersionMin;
   config->version_max = net::kDefaultSSLVersionMax;
   uint16_t version_min = SSLProtocolVersionFromString(version_min_str);
   uint16_t version_max = SSLProtocolVersionFromString(version_max_str);
   if (version_min) {
     config->version_min = version_min;
   }
   if (version_max) {
-    uint16_t supported_version_max = config->version_max;
-    config->version_max = std::min(supported_version_max, version_max);
+    config->version_max = version_max;
   }
   config->disabled_cipher_suites = disabled_cipher_suites_;
   config->dhe_enabled = dhe_enabled_.GetValue();
 }
 
 void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange(
     PrefService* local_state) {
   const base::ListValue* value =
       local_state->GetList(ssl_config::prefs::kCipherSuiteBlacklist);
   disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //  SSLConfigServiceManager
 
 namespace ssl_config {
 // static
 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager(
     PrefService* local_state,
     const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) {
   return new SSLConfigServiceManagerPref(local_state, io_task_runner);
 }
 
 // static
 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) {
   SSLConfigServiceManagerPref::RegisterPrefs(registry);
 }
 }  // namespace ssl_config