summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorrkn@chromium.org <rkn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 23:50:34 +0000
committerrkn@chromium.org <rkn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 23:50:34 +0000
commit2619d3318502ad7bc1c03f77bf5b699f8350c4c0 (patch)
tree763990bf25e893669b4d3f0fab94bc62ae3b086f /chrome
parent351631b199be296f6e6193312b4393a40b0e3b4c (diff)
downloadchromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.zip
chromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.tar.gz
chromium_src-2619d3318502ad7bc1c03f77bf5b699f8350c4c0.tar.bz2
Adds command-line switch for TLS origin bound certificate extension.
This extension is disabled by default. To enable, pass in the command line switch "--enable-ssl-origin-bound-certs". BUG=88782 TEST=None Review URL: http://codereview.chromium.org/7460002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_main.cc2
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
3 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index a887cce..3a17cb0 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -250,6 +250,8 @@ void BrowserMainParts::EarlyInitialization() {
net::SSLConfigService::DisableFalseStart();
if (parsed_command_line().HasSwitch(switches::kEnableSSLCachedInfo))
net::SSLConfigService::EnableCachedInfo();
+ if (parsed_command_line().HasSwitch(switches::kEnableOriginBoundCerts))
+ net::SSLConfigService::EnableOriginBoundCerts();
if (parsed_command_line().HasSwitch(
switches::kEnableDNSCertProvenanceChecking)) {
net::SSLConfigService::EnableDNSCertProvenanceChecking();
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e250d36..db82a6f 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -502,6 +502,9 @@ const char kEnableSmoothScrolling[] = "enable-smooth-scrolling";
// Enables TLS cached info extension.
const char kEnableSSLCachedInfo[] = "enable-ssl-cached-info";
+// Enables TLS origin bound certificate extension.
+const char kEnableOriginBoundCerts[] = "enable-origin-bound-certs";
+
// Enable syncing browser data to a Google Account.
const char kEnableSync[] = "enable-sync";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b57ae86..8a6658d 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -145,6 +145,7 @@ extern const char kEnableSearchProviderApiV2[];
extern const char kEnableShortcutsProvider[];
extern const char kEnableSmoothScrolling[];
extern const char kEnableSSLCachedInfo[];
+extern const char kEnableOriginBoundCerts[];
extern const char kEnableSync[];
extern const char kEnableSyncAutofill[];
extern const char kEnableSyncOAuth[];