Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Side by Side Diff: net/socket/ssl_client_socket_openssl.cc

Issue 657953003: Use version macros for SSL versions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <errno.h> 10 #include <errno.h>
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Returns the net SSL version number (see ssl_connection_status_flags.h) for 94 // Returns the net SSL version number (see ssl_connection_status_flags.h) for
95 // this SSL connection. 95 // this SSL connection.
96 int GetNetSSLVersion(SSL* ssl) { 96 int GetNetSSLVersion(SSL* ssl) {
97 switch (SSL_version(ssl)) { 97 switch (SSL_version(ssl)) {
98 case SSL2_VERSION: 98 case SSL2_VERSION:
99 return SSL_CONNECTION_VERSION_SSL2; 99 return SSL_CONNECTION_VERSION_SSL2;
100 case SSL3_VERSION: 100 case SSL3_VERSION:
101 return SSL_CONNECTION_VERSION_SSL3; 101 return SSL_CONNECTION_VERSION_SSL3;
102 case TLS1_VERSION: 102 case TLS1_VERSION:
103 return SSL_CONNECTION_VERSION_TLS1; 103 return SSL_CONNECTION_VERSION_TLS1;
104 case 0x0302: 104 case TLS1_1_VERSION:
105 return SSL_CONNECTION_VERSION_TLS1_1; 105 return SSL_CONNECTION_VERSION_TLS1_1;
106 case 0x0303: 106 case TLS1_2_VERSION:
107 return SSL_CONNECTION_VERSION_TLS1_2; 107 return SSL_CONNECTION_VERSION_TLS1_2;
108 default: 108 default:
109 return SSL_CONNECTION_VERSION_UNKNOWN; 109 return SSL_CONNECTION_VERSION_UNKNOWN;
110 } 110 }
111 } 111 }
112 112
113 ScopedX509 OSCertHandleToOpenSSL( 113 ScopedX509 OSCertHandleToOpenSSL(
114 X509Certificate::OSCertHandle os_handle) { 114 X509Certificate::OSCertHandle os_handle) {
115 #if defined(USE_OPENSSL_CERTS) 115 #if defined(USE_OPENSSL_CERTS)
116 return ScopedX509(X509Certificate::DupOSCertHandle(os_handle)); 116 return ScopedX509(X509Certificate::DupOSCertHandle(os_handle));
(...skipping 1701 matching lines...) Expand 10 before | Expand all | Expand 10 after
1818 ct::SCT_STATUS_LOG_UNKNOWN)); 1818 ct::SCT_STATUS_LOG_UNKNOWN));
1819 } 1819 }
1820 } 1820 }
1821 1821
1822 scoped_refptr<X509Certificate> 1822 scoped_refptr<X509Certificate>
1823 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const { 1823 SSLClientSocketOpenSSL::GetUnverifiedServerCertificateChain() const {
1824 return server_cert_; 1824 return server_cert_;
1825 } 1825 }
1826 1826
1827 } // namespace net 1827 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698