| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/api/socket/tls_socket.h" | 5 #include "extensions/browser/api/socket/tls_socket.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 context.cert_transparency_verifier = ct_verifier; | 246 context.cert_transparency_verifier = ct_verifier; |
| 247 context.ct_policy_enforcer = ct_policy_enforcer; | 247 context.ct_policy_enforcer = ct_policy_enforcer; |
| 248 | 248 |
| 249 // Fill in the SSL socket params. | 249 // Fill in the SSL socket params. |
| 250 net::SSLConfig ssl_config; | 250 net::SSLConfig ssl_config; |
| 251 ssl_config_service->GetSSLConfig(&ssl_config); | 251 ssl_config_service->GetSSLConfig(&ssl_config); |
| 252 if (options && options->tls_version.get()) { | 252 if (options && options->tls_version.get()) { |
| 253 uint16_t version_min = 0, version_max = 0; | 253 uint16_t version_min = 0, version_max = 0; |
| 254 api::socket::TLSVersionConstraints* versions = options->tls_version.get(); | 254 api::socket::TLSVersionConstraints* versions = options->tls_version.get(); |
| 255 if (versions->min.get()) { | 255 if (versions->min.get()) { |
| 256 version_min = SSLProtocolVersionFromString(*versions->min.get()); | 256 version_min = SSLProtocolVersionFromString(*versions->min); |
| 257 } | 257 } |
| 258 if (versions->max.get()) { | 258 if (versions->max.get()) { |
| 259 version_max = SSLProtocolVersionFromString(*versions->max.get()); | 259 version_max = SSLProtocolVersionFromString(*versions->max); |
| 260 } | 260 } |
| 261 if (version_min) { | 261 if (version_min) { |
| 262 ssl_config.version_min = version_min; | 262 ssl_config.version_min = version_min; |
| 263 } | 263 } |
| 264 if (version_max) { | 264 if (version_max) { |
| 265 ssl_config.version_max = version_max; | 265 ssl_config.version_max = version_max; |
| 266 } | 266 } |
| 267 } | 267 } |
| 268 | 268 |
| 269 net::ClientSocketFactory* socket_factory = | 269 net::ClientSocketFactory* socket_factory = |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 if (status != net::OK) { | 303 if (status != net::OK) { |
| 304 DVLOG(1) << "Status is not OK or IO-pending: " | 304 DVLOG(1) << "Status is not OK or IO-pending: " |
| 305 << net::ErrorToString(status); | 305 << net::ErrorToString(status); |
| 306 } | 306 } |
| 307 connect_cb.Run(status); | 307 connect_cb.Run(status); |
| 308 } | 308 } |
| 309 } | 309 } |
| 310 | 310 |
| 311 } // namespace extensions | 311 } // namespace extensions |
| 312 | 312 |
| OLD | NEW |