| Index: components/ssl_config/ssl_config_service_manager_pref.cc
|
| diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| index cd67d4c86c32c54a9b3be1a44cb7bc6112b1a0f4..23d7301659cd5749a4c103deae815dded3d85832 100644
|
| --- a/components/ssl_config/ssl_config_service_manager_pref.cc
|
| +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| @@ -79,6 +79,8 @@ uint16_t SSLProtocolVersionFromString(const std::string& version_str) {
|
| 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;
|
| }
|
| @@ -285,8 +287,7 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| 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();
|
|
|