| Index: chrome/browser/net/ssl_config_service_manager_pref.cc
|
| diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| index c193463d0d4287968998f13cc0e32041685b386a..3b19f9c07d68055bb6f9276bb36a5fd0f5ccb618 100644
|
| --- a/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc
|
| @@ -180,6 +180,7 @@ class SSLConfigServiceManagerPref
|
| StringPrefMember ssl_version_max_;
|
| BooleanPrefMember channel_id_enabled_;
|
| BooleanPrefMember ssl_record_splitting_disabled_;
|
| + BooleanPrefMember ssl3_version_fallback_enabled_;
|
|
|
| // The cached list of disabled SSL cipher suites.
|
| std::vector<uint16> disabled_cipher_suites_;
|
| @@ -219,6 +220,8 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| prefs::kEnableOriginBoundCerts, local_state, local_state_callback);
|
| ssl_record_splitting_disabled_.Init(
|
| prefs::kDisableSSLRecordSplitting, local_state, local_state_callback);
|
| + ssl3_version_fallback_enabled_.Init(
|
| + prefs::kEnableSSL3VersionFallback, local_state, local_state_callback);
|
|
|
| local_state_change_registrar_.Init(local_state);
|
| local_state_change_registrar_.Add(
|
| @@ -260,6 +263,9 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
|
| default_config.channel_id_enabled);
|
| registry->RegisterBooleanPref(prefs::kDisableSSLRecordSplitting,
|
| !default_config.false_start_enabled);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kEnableSSL3VersionFallback,
|
| + default_config.ssl3_version_fallback_enabled);
|
| registry->RegisterListPref(prefs::kCipherSuiteBlacklist);
|
| }
|
|
|
| @@ -321,6 +327,8 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| config->channel_id_enabled = false;
|
| // disabling False Start also happens to disable record splitting.
|
| config->false_start_enabled = !ssl_record_splitting_disabled_.GetValue();
|
| + config->ssl3_version_fallback_enabled =
|
| + ssl3_version_fallback_enabled_.GetValue();
|
| SSLConfigServicePref::SetSSLConfigFlags(config);
|
| }
|
|
|
|
|