| 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 11cf84c40de97e9f460fa19c58fc84be875590c0..42da7a14bf14ee41e5b85ae9f199db9215065b16 100644
|
| --- a/components/ssl_config/ssl_config_service_manager_pref.cc
|
| +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| @@ -167,7 +167,6 @@ class SSLConfigServiceManagerPref : public ssl_config::SSLConfigServiceManager {
|
| BooleanPrefMember rev_checking_required_local_anchors_;
|
| StringPrefMember ssl_version_min_;
|
| StringPrefMember ssl_version_max_;
|
| - StringPrefMember ssl_version_fallback_min_;
|
|
|
| // The cached list of disabled SSL cipher suites.
|
| std::vector<uint16_t> disabled_cipher_suites_;
|
| @@ -199,8 +198,6 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| local_state_callback);
|
| ssl_version_max_.Init(ssl_config::prefs::kSSLVersionMax, local_state,
|
| local_state_callback);
|
| - ssl_version_fallback_min_.Init(ssl_config::prefs::kSSLVersionFallbackMin,
|
| - local_state, local_state_callback);
|
|
|
| local_state_change_registrar_.Init(local_state);
|
| local_state_change_registrar_.Add(ssl_config::prefs::kCipherSuiteBlacklist,
|
| @@ -226,8 +223,6 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
|
| std::string());
|
| registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax,
|
| std::string());
|
| - registry->RegisterStringPref(ssl_config::prefs::kSSLVersionFallbackMin,
|
| - std::string());
|
| registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist);
|
| }
|
|
|
| @@ -264,14 +259,10 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| rev_checking_required_local_anchors_.GetValue();
|
| std::string version_min_str = ssl_version_min_.GetValue();
|
| std::string version_max_str = ssl_version_max_.GetValue();
|
| - std::string version_fallback_min_str = ssl_version_fallback_min_.GetValue();
|
| config->version_min = net::kDefaultSSLVersionMin;
|
| config->version_max = net::kDefaultSSLVersionMax;
|
| - config->version_fallback_min = net::kDefaultSSLVersionFallbackMin;
|
| uint16_t version_min = SSLProtocolVersionFromString(version_min_str);
|
| uint16_t version_max = SSLProtocolVersionFromString(version_max_str);
|
| - uint16_t version_fallback_min =
|
| - SSLProtocolVersionFromString(version_fallback_min_str);
|
| if (version_min) {
|
| config->version_min = version_min;
|
| }
|
| @@ -279,11 +270,6 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| uint16_t supported_version_max = config->version_max;
|
| config->version_max = std::min(supported_version_max, version_max);
|
| }
|
| - // Values below TLS 1.1 are invalid.
|
| - if (version_fallback_min &&
|
| - version_fallback_min >= net::SSL_PROTOCOL_VERSION_TLS1_1) {
|
| - config->version_fallback_min = version_fallback_min;
|
| - }
|
| config->disabled_cipher_suites = disabled_cipher_suites_;
|
| }
|
|
|
|
|