diff options
| author | davidben <davidben@chromium.org> | 2014-11-05 10:55:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-05 18:56:01 +0000 |
| commit | 1d094026bf5b8d8a9639b2d2942223b88fe0e576 (patch) | |
| tree | 9b0991e2db7b3ee741cc804b5c2a9c936d473a52 | |
| parent | 4719b849d3296652490defe871a4c1a8f6401f0d (diff) | |
| download | chromium_src-1d094026bf5b8d8a9639b2d2942223b88fe0e576.zip chromium_src-1d094026bf5b8d8a9639b2d2942223b88fe0e576.tar.gz chromium_src-1d094026bf5b8d8a9639b2d2942223b88fe0e576.tar.bz2 | |
Use version macros for SSL versions.
We only support building with our bundled SSL implementations, so
there's no need to be conservative about constants.
BUG=none
Review URL: https://codereview.chromium.org/657953003
Cr-Commit-Position: refs/heads/master@{#302840}
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 6 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index eee4772..b0e9836 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2488,8 +2488,6 @@ void SSLClientSocketNSS::Core::UpdateConnectionStatus() { SSL_CONNECTION_COMPRESSION_MASK) << SSL_CONNECTION_COMPRESSION_SHIFT; - // NSS 3.14.x doesn't have a version macro for TLS 1.2 (because NSS didn't - // support it yet), so use 0x0303 directly. int version = SSL_CONNECTION_VERSION_UNKNOWN; if (channel_info.protocolVersion < SSL_LIBRARY_VERSION_3_0) { // All versions less than SSL_LIBRARY_VERSION_3_0 are treated as SSL @@ -2497,11 +2495,11 @@ void SSLClientSocketNSS::Core::UpdateConnectionStatus() { version = SSL_CONNECTION_VERSION_SSL2; } else if (channel_info.protocolVersion == SSL_LIBRARY_VERSION_3_0) { version = SSL_CONNECTION_VERSION_SSL3; - } else if (channel_info.protocolVersion == SSL_LIBRARY_VERSION_3_1_TLS) { + } else if (channel_info.protocolVersion == SSL_LIBRARY_VERSION_TLS_1_0) { version = SSL_CONNECTION_VERSION_TLS1; } else if (channel_info.protocolVersion == SSL_LIBRARY_VERSION_TLS_1_1) { version = SSL_CONNECTION_VERSION_TLS1_1; - } else if (channel_info.protocolVersion == 0x0303) { + } else if (channel_info.protocolVersion == SSL_LIBRARY_VERSION_TLS_1_2) { version = SSL_CONNECTION_VERSION_TLS1_2; } nss_handshake_state_.ssl_connection_status |= diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 2d1830f..c0ce045 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -101,9 +101,9 @@ int GetNetSSLVersion(SSL* ssl) { return SSL_CONNECTION_VERSION_SSL3; case TLS1_VERSION: return SSL_CONNECTION_VERSION_TLS1; - case 0x0302: + case TLS1_1_VERSION: return SSL_CONNECTION_VERSION_TLS1_1; - case 0x0303: + case TLS1_2_VERSION: return SSL_CONNECTION_VERSION_TLS1_2; default: return SSL_CONNECTION_VERSION_UNKNOWN; |