diff options
Diffstat (limited to 'chromium/net/ssl')
| -rw-r--r-- | chromium/net/ssl/openssl_ssl_util.cc | 1 | ||||
| -rw-r--r-- | chromium/net/ssl/ssl_client_session_cache.cc | 6 | ||||
| -rw-r--r-- | chromium/net/ssl/ssl_config_service.h | 5 | ||||
| -rw-r--r-- | chromium/net/ssl/ssl_connection_status_flags.h | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/chromium/net/ssl/openssl_ssl_util.cc b/chromium/net/ssl/openssl_ssl_util.cc index 77fa36a277d..b03c9b32ed0 100644 --- a/chromium/net/ssl/openssl_ssl_util.cc +++ b/chromium/net/ssl/openssl_ssl_util.cc @@ -11,6 +11,7 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h" +#include "base/notreached.h" #include "base/values.h" #include "build/build_config.h" #include "crypto/openssl_util.h" diff --git a/chromium/net/ssl/ssl_client_session_cache.cc b/chromium/net/ssl/ssl_client_session_cache.cc index 00bd91764cc..1869eba9669 100644 --- a/chromium/net/ssl/ssl_client_session_cache.cc +++ b/chromium/net/ssl/ssl_client_session_cache.cc @@ -48,9 +48,9 @@ SSLClientSessionCache::SSLClientSessionCache(const Config& config) config_(config), cache_(config.max_entries), lookups_since_flush_(0) { - memory_pressure_listener_.reset( - new base::MemoryPressureListener(base::BindRepeating( - &SSLClientSessionCache::OnMemoryPressure, base::Unretained(this)))); + memory_pressure_listener_ = std::make_unique<base::MemoryPressureListener>( + FROM_HERE, base::BindRepeating(&SSLClientSessionCache::OnMemoryPressure, + base::Unretained(this))); } SSLClientSessionCache::~SSLClientSessionCache() { diff --git a/chromium/net/ssl/ssl_config_service.h b/chromium/net/ssl/ssl_config_service.h index 6a553c64df7..0b2b947d58e 100644 --- a/chromium/net/ssl/ssl_config_service.h +++ b/chromium/net/ssl/ssl_config_service.h @@ -46,10 +46,7 @@ struct NET_EXPORT SSLContextConfig { // If true, enables TLS 1.3 downgrade hardening for connections using // local trust anchors. (Hardening for known roots is always enabled.) - // - // TODO(https://crbug.com/1033598): Enable this it has successfully been - // enabled in Chrome. - bool tls13_hardening_for_local_anchors_enabled = false; + bool tls13_hardening_for_local_anchors_enabled = true; }; // The interface for retrieving global SSL configuration. This interface diff --git a/chromium/net/ssl/ssl_connection_status_flags.h b/chromium/net/ssl/ssl_connection_status_flags.h index cd3ad50cb87..a2f2b0e146c 100644 --- a/chromium/net/ssl/ssl_connection_status_flags.h +++ b/chromium/net/ssl/ssl_connection_status_flags.h @@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/logging.h" +#include "base/check_op.h" #include "base/macros.h" namespace net { |