OLD | NEW |
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 #include "net/socket/ssl_client_socket_impl.h" | 5 #include "net/socket/ssl_client_socket_impl.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <openssl/bio.h> | 8 #include <openssl/bio.h> |
9 #include <openssl/bytestring.h> | 9 #include <openssl/bytestring.h> |
10 #include <openssl/err.h> | 10 #include <openssl/err.h> |
(...skipping 2094 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2105 switch (ssl_config_.version_max) { | 2105 switch (ssl_config_.version_max) { |
2106 case SSL_PROTOCOL_VERSION_TLS1: | 2106 case SSL_PROTOCOL_VERSION_TLS1: |
2107 result.append("tls1"); | 2107 result.append("tls1"); |
2108 break; | 2108 break; |
2109 case SSL_PROTOCOL_VERSION_TLS1_1: | 2109 case SSL_PROTOCOL_VERSION_TLS1_1: |
2110 result.append("tls1.1"); | 2110 result.append("tls1.1"); |
2111 break; | 2111 break; |
2112 case SSL_PROTOCOL_VERSION_TLS1_2: | 2112 case SSL_PROTOCOL_VERSION_TLS1_2: |
2113 result.append("tls1.2"); | 2113 result.append("tls1.2"); |
2114 break; | 2114 break; |
| 2115 case SSL_PROTOCOL_VERSION_TLS1_3: |
| 2116 result.append("tls1.3"); |
| 2117 break; |
2115 default: | 2118 default: |
2116 NOTREACHED(); | 2119 NOTREACHED(); |
2117 } | 2120 } |
2118 | 2121 |
2119 result.append("/"); | 2122 result.append("/"); |
2120 if (ssl_config_.deprecated_cipher_suites_enabled) | 2123 if (ssl_config_.deprecated_cipher_suites_enabled) |
2121 result.append("deprecated"); | 2124 result.append("deprecated"); |
2122 | 2125 |
2123 result.append("/"); | 2126 result.append("/"); |
2124 if (ssl_config_.channel_id_enabled) | 2127 if (ssl_config_.channel_id_enabled) |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2317 if (rv != OK) { | 2320 if (rv != OK) { |
2318 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); | 2321 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); |
2319 return; | 2322 return; |
2320 } | 2323 } |
2321 | 2324 |
2322 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, | 2325 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, |
2323 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); | 2326 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); |
2324 } | 2327 } |
2325 | 2328 |
2326 } // namespace net | 2329 } // namespace net |
OLD | NEW |