diff options
| author | davidben <davidben@chromium.org> | 2014-10-01 14:36:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-01 21:36:55 +0000 |
| commit | 8a895ccf9de442b7c0c255ac268a557b47e84fb9 (patch) | |
| tree | 1dd27563b4290c2b71717241a3b83f79871dd408 /net | |
| parent | adab4b9162250dae2fb858029d03fc39c6ae9393 (diff) | |
| download | chromium_src-8a895ccf9de442b7c0c255ac268a557b47e84fb9.zip chromium_src-8a895ccf9de442b7c0c255ac268a557b47e84fb9.tar.gz chromium_src-8a895ccf9de442b7c0c255ac268a557b47e84fb9.tar.bz2 | |
Remove unnecessary ifdefs for maximum SSL version.
Only the bundled BoringSSL is supported; the maximum version is TLS 1.2.
BUG=none
Review URL: https://codereview.chromium.org/611263003
Cr-Commit-Position: refs/heads/master@{#297712}
Diffstat (limited to 'net')
| -rw-r--r-- | net/ssl/ssl_config.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/net/ssl/ssl_config.cc b/net/ssl/ssl_config.cc index 0282991..269934b 100644 --- a/net/ssl/ssl_config.cc +++ b/net/ssl/ssl_config.cc @@ -4,26 +4,11 @@ #include "net/ssl/ssl_config.h" -#if defined(USE_OPENSSL) -#include <openssl/ssl.h> -#endif - namespace net { const uint16 kDefaultSSLVersionMin = SSL_PROTOCOL_VERSION_SSL3; -const uint16 kDefaultSSLVersionMax = -#if defined(USE_OPENSSL) -#if defined(SSL_OP_NO_TLSv1_2) - SSL_PROTOCOL_VERSION_TLS1_2; -#elif defined(SSL_OP_NO_TLSv1_1) - SSL_PROTOCOL_VERSION_TLS1_1; -#else - SSL_PROTOCOL_VERSION_TLS1; -#endif -#else - SSL_PROTOCOL_VERSION_TLS1_2; -#endif +const uint16 kDefaultSSLVersionMax = SSL_PROTOCOL_VERSION_TLS1_2; SSLConfig::CertAndStatus::CertAndStatus() : cert_status(0) {} |