diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 00:23:07 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 00:23:07 +0000 |
| commit | f6c02375c9a589f5415b9f9869d70b83528bc73d (patch) | |
| tree | 2763106b466b16d994197b18745da6c13201f9d3 /net/base | |
| parent | ff56572b431626b608de7df634cddf179ae38cc3 (diff) | |
| download | chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.zip chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.tar.gz chromium_src-f6c02375c9a589f5415b9f9869d70b83528bc73d.tar.bz2 | |
Enable TLS channeld id by default.
Replace --enable-origin-bound-certs command line flag with
--disable-tls-channel-id.
Remove field trial.
BUG=136462,129174
Review URL: https://chromiumcodereview.appspot.com/10910240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/ssl_config_service.cc | 10 | ||||
| -rw-r--r-- | net/base/ssl_config_service.h | 3 |
2 files changed, 1 insertions, 12 deletions
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc index f9ee9ef..f7c18aa 100644 --- a/net/base/ssl_config_service.cc +++ b/net/base/ssl_config_service.cc @@ -38,7 +38,7 @@ SSLConfig::SSLConfig() version_min(g_default_version_min), version_max(g_default_version_max), cached_info_enabled(false), - channel_id_enabled(false), + channel_id_enabled(true), false_start_enabled(true), send_client_cert(false), verify_ev_cert(false), @@ -74,7 +74,6 @@ SSLConfigService::SSLConfigService() } static bool g_cached_info_enabled = false; -static bool g_channel_id_trial = false; // GlobalCRLSet holds a reference to the global CRLSet. It simply wraps a lock // around a scoped_refptr so that getting a reference doesn't race with @@ -133,11 +132,6 @@ uint16 SSLConfigService::default_version_max() { return g_default_version_max; } -// static -void SSLConfigService::EnableChannelIDTrial() { - g_channel_id_trial = true; -} - void SSLConfigService::AddObserver(Observer* observer) { observer_list_.AddObserver(observer); } @@ -152,8 +146,6 @@ SSLConfigService::~SSLConfigService() { // static void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) { ssl_config->cached_info_enabled = g_cached_info_enabled; - if (g_channel_id_trial) - ssl_config->channel_id_enabled = true; } void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config, diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h index 9f1722e..8210038 100644 --- a/net/base/ssl_config_service.h +++ b/net/base/ssl_config_service.h @@ -183,9 +183,6 @@ class NET_EXPORT SSLConfigService static void SetDefaultVersionMax(uint16 version_max); static uint16 default_version_max(); - // Force channel ID support to be enabled. - static void EnableChannelIDTrial(); - // Is SNI available in this configuration? static bool IsSNIAvailable(SSLConfigService* service); |