diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_main.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/net/ssl_config_service_manager_pref.cc | 1 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 6b29674..fc6511b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -175,6 +175,9 @@ void BrowserMainParts::EarlyInitialization() { PrefetchFieldTrial(); InitializeSSL(); + if (parsed_command_line().HasSwitch(switches::kEnableDNSSECCerts)) + net::SSLConfigService::EnableDNSSEC(); + PostEarlyInitialization(); } diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index a89f025..c729d0e 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -145,6 +145,7 @@ void SSLConfigServiceManagerPref::GetSSLConfigFromPrefs( config->ssl2_enabled = ssl2_enabled_.GetValue(); config->ssl3_enabled = ssl3_enabled_.GetValue(); config->tls1_enabled = tls1_enabled_.GetValue(); + config->dnssec_enabled = net::SSLConfigService::dnssec_enabled(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 5293e62..3f8b0f5 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -333,6 +333,8 @@ const char kEnableDeviceMotion[] = "enable-device-motion"; // Enables device orientation events. const char kEnableDeviceOrientation[] = "enable-device-orientation"; +const char kEnableDNSSECCerts[] = "enable-dnssec-certs"; + // Enables extension APIs that are in development. const char kEnableExperimentalExtensionApis[] = "enable-experimental-extension-apis"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index fba6d71..dde93de 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -110,6 +110,7 @@ extern const char kEnableContentPrefetch[]; extern const char kEnableCookiePrompt[]; extern const char kEnableDeviceMotion[]; extern const char kEnableDeviceOrientation[]; +extern const char kEnableDNSSECCerts[]; extern const char kEnableExperimentalExtensionApis[]; extern const char kEnableExperimentalWebGL[]; extern const char kEnableExtensionTimelineApi[]; |