| Index: net/base/ssl_config_service.cc
|
| diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
|
| index d02df385b93c3e088709dd1881d1f1178f9d207d..b689560fcc29863aa16fdd766b5a7deb86dcbc54 100644
|
| --- a/net/base/ssl_config_service.cc
|
| +++ b/net/base/ssl_config_service.cc
|
| @@ -2,6 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/atomic_sequence_num.h"
|
| #include "net/base/ssl_config_service.h"
|
| #include "net/base/ssl_false_start_blacklist.h"
|
|
|
| @@ -24,7 +25,7 @@ SSLConfig::SSLConfig()
|
| tls1_enabled(true), dnssec_enabled(false), snap_start_enabled(false),
|
| dns_cert_provenance_checking_enabled(false),
|
| session_resume_disabled(false), mitm_proxies_allowed(false),
|
| - false_start_enabled(true), send_client_cert(false),
|
| + false_start_enabled(true), session_cache_id(0), send_client_cert(false),
|
| verify_ev_cert(false), ssl3_fallback(false) {
|
| }
|
|
|
| @@ -39,8 +40,11 @@ bool SSLConfig::IsAllowedBadCert(X509Certificate* cert) const {
|
| return false;
|
| }
|
|
|
| +static base::AtomicSequenceNumber g_session_cache_id(base::LINKER_INITIALIZED);
|
| +
|
| SSLConfigService::SSLConfigService()
|
| - : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
|
| + : session_cache_id_(g_session_cache_id.GetNext()),
|
| + observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
|
| }
|
|
|
| SSLConfigService::~SSLConfigService() {
|
| @@ -99,7 +103,6 @@ static bool g_mitm_proxies_allowed = false;
|
| static bool g_snap_start_enabled = false;
|
| static bool g_dns_cert_provenance_checking = false;
|
|
|
| -// static
|
| void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
|
| ssl_config->dnssec_enabled = g_dnssec_enabled;
|
| ssl_config->false_start_enabled = g_false_start_enabled;
|
| @@ -107,6 +110,7 @@ void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
|
| ssl_config->snap_start_enabled = g_snap_start_enabled;
|
| ssl_config->dns_cert_provenance_checking_enabled =
|
| g_dns_cert_provenance_checking;
|
| + ssl_config->session_cache_id = session_cache_id_;
|
| }
|
|
|
| // static
|
|
|