| 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 2bd06679402c1c2d5bed698872182b461bc463d1..ee6304743c0e6fb8c89cdb8cd86c10e5af045769 100644
|
| --- a/components/ssl_config/ssl_config_service_manager_pref.cc
|
| +++ b/components/ssl_config/ssl_config_service_manager_pref.cc
|
| @@ -173,6 +173,7 @@ class SSLConfigServiceManagerPref : public ssl_config::SSLConfigServiceManager {
|
| BooleanPrefMember rev_checking_enabled_;
|
| BooleanPrefMember rev_checking_required_local_anchors_;
|
| BooleanPrefMember sha1_local_anchors_enabled_;
|
| + BooleanPrefMember common_name_fallback_local_anchors_enabled_;
|
| StringPrefMember ssl_version_min_;
|
| StringPrefMember ssl_version_max_;
|
|
|
| @@ -211,6 +212,9 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
|
| sha1_local_anchors_enabled_.Init(
|
| ssl_config::prefs::kCertEnableSha1LocalAnchors, local_state,
|
| local_state_callback);
|
| + common_name_fallback_local_anchors_enabled_.Init(
|
| + ssl_config::prefs::kCertEnableCommonNameFallbackLocalAnchors, local_state,
|
| + local_state_callback);
|
| ssl_version_min_.Init(ssl_config::prefs::kSSLVersionMin, local_state,
|
| local_state_callback);
|
| ssl_version_max_.Init(ssl_config::prefs::kSSLVersionMax, local_state,
|
| @@ -238,6 +242,8 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
|
| default_config.rev_checking_required_local_anchors);
|
| registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors,
|
| false);
|
| + registry->RegisterBooleanPref(
|
| + ssl_config::prefs::kCertEnableCommonNameFallbackLocalAnchors, false);
|
| registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin,
|
| std::string());
|
| registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax,
|
| @@ -277,6 +283,8 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs(
|
| config->rev_checking_required_local_anchors =
|
| rev_checking_required_local_anchors_.GetValue();
|
| config->sha1_local_anchors_enabled = sha1_local_anchors_enabled_.GetValue();
|
| + config->common_name_fallback_local_anchors_enabled =
|
| + common_name_fallback_local_anchors_enabled_.GetValue();
|
| std::string version_min_str = ssl_version_min_.GetValue();
|
| std::string version_max_str = ssl_version_max_.GetValue();
|
| config->version_min = net::kDefaultSSLVersionMin;
|
|
|