diff options
| author | bnc <bnc@chromium.org> | 2014-12-09 11:47:58 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 19:48:50 +0000 |
| commit | 984a84a3d1a99a1accf55b4db46dfdc7df29e6d6 (patch) | |
| tree | 2e612d71e6e5a7f89a2e626b7bda23a8e2c38ab6 /net/ssl | |
| parent | c1751458b9409f52c56b3f84d8226c57c39369d5 (diff) | |
| download | chromium_src-984a84a3d1a99a1accf55b4db46dfdc7df29e6d6.zip chromium_src-984a84a3d1a99a1accf55b4db46dfdc7df29e6d6.tar.gz chromium_src-984a84a3d1a99a1accf55b4db46dfdc7df29e6d6.tar.bz2 | |
Remove kDefaultSSLVersionMax.
https://crrev.com/768413002 made kDefaultSSLVersionMax obsolete. This CL
removes its declaration and definition, and changes its only remaining
occurrence to SSLClientSocket::GetMaxSupportedSSLVersion().
BUG=436835
Review URL: https://codereview.chromium.org/748143005
Cr-Commit-Position: refs/heads/master@{#307524}
Diffstat (limited to 'net/ssl')
| -rw-r--r-- | net/ssl/ssl_config.cc | 6 | ||||
| -rw-r--r-- | net/ssl/ssl_config.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/ssl/ssl_config.cc b/net/ssl/ssl_config.cc index 8efdd583..56cb75c 100644 --- a/net/ssl/ssl_config.cc +++ b/net/ssl/ssl_config.cc @@ -4,12 +4,12 @@ #include "net/ssl/ssl_config.h" +#include "net/socket/ssl_client_socket.h" + namespace net { const uint16 kDefaultSSLVersionMin = SSL_PROTOCOL_VERSION_TLS1; -const uint16 kDefaultSSLVersionMax = SSL_PROTOCOL_VERSION_TLS1_2; - const uint16 kDefaultSSLVersionFallbackMin = SSL_PROTOCOL_VERSION_TLS1; SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} @@ -20,7 +20,7 @@ SSLConfig::SSLConfig() : rev_checking_enabled(false), rev_checking_required_local_anchors(false), version_min(kDefaultSSLVersionMin), - version_max(kDefaultSSLVersionMax), + version_max(SSLClientSocket::GetMaxSupportedSSLVersion()), version_fallback_min(kDefaultSSLVersionFallbackMin), channel_id_enabled(true), false_start_enabled(true), diff --git a/net/ssl/ssl_config.h b/net/ssl/ssl_config.h index 1deaf6e..5a0c0fa 100644 --- a/net/ssl/ssl_config.h +++ b/net/ssl/ssl_config.h @@ -29,8 +29,8 @@ enum { // Default minimum protocol version. NET_EXPORT extern const uint16 kDefaultSSLVersionMin; -// Default maximum protocol version. -NET_EXPORT extern const uint16 kDefaultSSLVersionMax; +// For maximum supported protocol version, use +// SSLClientSocket::GetMaxSupportedSSLVersion(). // Default minimum protocol version that it's acceptable to fallback to. NET_EXPORT extern const uint16 kDefaultSSLVersionFallbackMin; |