summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_config_service.cc
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-09-27 23:06:40 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-09-27 23:06:40 +0200
commit109c1679d462802b7abb241f4d42e25cffcbcd31 (patch)
tree3c0d3c220419fd64edc3b91215ce776c04935b78 /net/base/ssl_config_service.cc
parent657fb1c9269ce235b66a0f32c9bf0afc64fa7c77 (diff)
downloadexternal_chromium-master.zip
external_chromium-master.tar.gz
external_chromium-master.tar.bz2
add tls1_1, tls1_2 settings, remove sslv3 fallback code, disable RC4HEADmaster
Change-Id: I9ab98fbeb040a4a2a0e8ba3c5e260f61303ed199
Diffstat (limited to 'net/base/ssl_config_service.cc')
-rw-r--r--net/base/ssl_config_service.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
index 4867681..1939458 100644
--- a/net/base/ssl_config_service.cc
+++ b/net/base/ssl_config_service.cc
@@ -14,8 +14,8 @@ SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {}
SSLConfig::CertAndStatus::~CertAndStatus() {}
SSLConfig::SSLConfig()
- : rev_checking_enabled(true), ssl3_enabled(true),
- tls1_enabled(true), dnssec_enabled(false),
+ : rev_checking_enabled(true), ssl3_enabled(false),
+ tls1_enabled(true),tls1_1_enabled(true), tls1_2_enabled(true), dnssec_enabled(false),
dns_cert_provenance_checking_enabled(false),
false_start_enabled(true),
send_client_cert(false), verify_ev_cert(false), ssl3_fallback(false) {
@@ -110,7 +110,9 @@ void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
const SSLConfig& new_config) {
if (orig_config.rev_checking_enabled != new_config.rev_checking_enabled ||
orig_config.ssl3_enabled != new_config.ssl3_enabled ||
- orig_config.tls1_enabled != new_config.tls1_enabled) {
+ orig_config.tls1_enabled != new_config.tls1_enabled ||
+ orig_config.tls1_1_enabled != new_config.tls1_1_enabled ||
+ orig_config.tls1_2_enabled != new_config.tls1_2_enabled) {
FOR_EACH_OBSERVER(Observer, observer_list_, OnSSLConfigChanged());
}
}