diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 04:56:43 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-23 04:56:43 +0000 |
| commit | 373e65ed203d0acd9c1bf20fb2c91dabe50b7bc4 (patch) | |
| tree | b96deb8582be926cc69df462a39f7018b0f416e8 /chrome/common | |
| parent | ad4d54e931fe3b556cdd9e859a8654e4e6caed68 (diff) | |
| download | chromium_src-373e65ed203d0acd9c1bf20fb2c91dabe50b7bc4.zip chromium_src-373e65ed203d0acd9c1bf20fb2c91dabe50b7bc4.tar.gz chromium_src-373e65ed203d0acd9c1bf20fb2c91dabe50b7bc4.tar.bz2 | |
Add a preference and command-line option to disable SSL/TLS cipher suites
R=battre
BUG=58831
TEST=unit_tests --gtest_filter=CommandLinePrefStoreTest.DisableSSLCipherSuites:SSLConfigServiceManagerPrefTest.*
Review URL: http://codereview.chromium.org/7462008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
| -rw-r--r-- | chrome/common/pref_names.cc | 1 | ||||
| -rw-r--r-- | chrome/common/pref_names.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 5eab5e3..1011697 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -112,6 +112,9 @@ const char kCheckForUpdateIntervalSec[] = "check-for-update-interval"; // this version cannot be loaded, Chrome will exit. const char kChromeVersion[] = "chrome-version"; +// Comma-separated list of SSL cipher suites to disable. +const char kCipherSuiteBlacklist[] = "cipher-suite-blacklist"; + // Used with kCloudPrintFile. Tells Chrome to delete the file when // finished displaying the print dialog. const char kCloudPrintDeleteFile[] = "cloud-print-delete-file"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 0088b0b..3fe3cfd 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -48,6 +48,7 @@ extern const char kBrowserAssertTest[]; extern const char kBrowserCrashTest[]; extern const char kCheckForUpdateIntervalSec[]; extern const char kChromeVersion[]; +extern const char kCipherSuiteBlacklist[]; extern const char kCloudPrintDeleteFile[]; extern const char kCloudPrintFile[]; extern const char kCloudPrintJobTitle[]; diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc index eeb55ba..f11b4d8 100644 --- a/chrome/common/pref_names.cc +++ b/chrome/common/pref_names.cc @@ -749,6 +749,7 @@ const char kProfileInfoCache[] = "profile.info_cache"; const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled"; const char kSSL3Enabled[] = "ssl.ssl3.enabled"; const char kTLS1Enabled[] = "ssl.tls1.enabled"; +const char kCipherSuiteBlacklist[] = "ssl.cipher_suites.blacklist"; // The metrics client GUID and session ID. const char kMetricsClientID[] = "user_experience_metrics.client_id"; diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h index 08e1318..f45de8a 100644 --- a/chrome/common/pref_names.h +++ b/chrome/common/pref_names.h @@ -255,6 +255,7 @@ extern const char kPasswordsUseLocalProfileId[]; extern const char kCertRevocationCheckingEnabled[]; extern const char kSSL3Enabled[]; extern const char kTLS1Enabled[]; +extern const char kCipherSuiteBlacklist[]; extern const char kMetricsClientID[]; extern const char kMetricsSessionID[]; |