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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
792 bool SSLClientSocketImpl::GetSSLInfo(SSLInfo* ssl_info) { | 792 bool SSLClientSocketImpl::GetSSLInfo(SSLInfo* ssl_info) { |
793 ssl_info->Reset(); | 793 ssl_info->Reset(); |
794 if (server_cert_chain_->empty()) | 794 if (server_cert_chain_->empty()) |
795 return false; | 795 return false; |
796 | 796 |
797 ssl_info->cert = server_cert_verify_result_.verified_cert; | 797 ssl_info->cert = server_cert_verify_result_.verified_cert; |
798 ssl_info->unverified_cert = server_cert_; | 798 ssl_info->unverified_cert = server_cert_; |
799 ssl_info->cert_status = server_cert_verify_result_.cert_status; | 799 ssl_info->cert_status = server_cert_verify_result_.cert_status; |
800 ssl_info->is_issued_by_known_root = | 800 ssl_info->is_issued_by_known_root = |
801 server_cert_verify_result_.is_issued_by_known_root; | 801 server_cert_verify_result_.is_issued_by_known_root; |
| 802 ssl_info->pkp_bypassed = server_cert_verify_result_.pkp_bypassed; |
802 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; | 803 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; |
803 ssl_info->client_cert_sent = | 804 ssl_info->client_cert_sent = |
804 ssl_config_.send_client_cert && ssl_config_.client_cert.get(); | 805 ssl_config_.send_client_cert && ssl_config_.client_cert.get(); |
805 ssl_info->channel_id_sent = channel_id_sent_; | 806 ssl_info->channel_id_sent = channel_id_sent_; |
806 ssl_info->token_binding_negotiated = tb_was_negotiated_; | 807 ssl_info->token_binding_negotiated = tb_was_negotiated_; |
807 ssl_info->token_binding_key_param = tb_negotiated_param_; | 808 ssl_info->token_binding_key_param = tb_negotiated_param_; |
808 ssl_info->pinning_failure_log = pinning_failure_log_; | 809 ssl_info->pinning_failure_log = pinning_failure_log_; |
809 | 810 |
810 AddCTInfoToSSLInfo(ssl_info); | 811 AddCTInfoToSSLInfo(ssl_info); |
811 | 812 |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1349 | 1350 |
1350 const CertStatus cert_status = server_cert_verify_result_.cert_status; | 1351 const CertStatus cert_status = server_cert_verify_result_.cert_status; |
1351 if (transport_security_state_ && | 1352 if (transport_security_state_ && |
1352 (result == OK || | 1353 (result == OK || |
1353 (IsCertificateError(result) && IsCertStatusMinorError(cert_status))) && | 1354 (IsCertificateError(result) && IsCertStatusMinorError(cert_status))) && |
1354 !transport_security_state_->CheckPublicKeyPins( | 1355 !transport_security_state_->CheckPublicKeyPins( |
1355 host_and_port_, server_cert_verify_result_.is_issued_by_known_root, | 1356 host_and_port_, server_cert_verify_result_.is_issued_by_known_root, |
1356 server_cert_verify_result_.public_key_hashes, server_cert_.get(), | 1357 server_cert_verify_result_.public_key_hashes, server_cert_.get(), |
1357 server_cert_verify_result_.verified_cert.get(), | 1358 server_cert_verify_result_.verified_cert.get(), |
1358 TransportSecurityState::ENABLE_PIN_REPORTS, &pinning_failure_log_)) { | 1359 TransportSecurityState::ENABLE_PIN_REPORTS, &pinning_failure_log_)) { |
1359 result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN; | 1360 if (server_cert_verify_result_.is_issued_by_known_root) |
| 1361 result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN; |
| 1362 else |
| 1363 server_cert_verify_result_.pkp_bypassed = true; |
1360 } | 1364 } |
1361 | 1365 |
1362 if (result == OK) { | 1366 if (result == OK) { |
1363 // Only check Certificate Transparency if there were no other errors with | 1367 // Only check Certificate Transparency if there were no other errors with |
1364 // the connection. | 1368 // the connection. |
1365 VerifyCT(); | 1369 VerifyCT(); |
1366 | 1370 |
1367 DCHECK(!certificate_verified_); | 1371 DCHECK(!certificate_verified_); |
1368 certificate_verified_ = true; | 1372 certificate_verified_ = true; |
1369 MaybeCacheSession(); | 1373 MaybeCacheSession(); |
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2336 if (rv != OK) { | 2340 if (rv != OK) { |
2337 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); | 2341 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); |
2338 return; | 2342 return; |
2339 } | 2343 } |
2340 | 2344 |
2341 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, | 2345 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, |
2342 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); | 2346 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); |
2343 } | 2347 } |
2344 | 2348 |
2345 } // namespace net | 2349 } // namespace net |
OLD | NEW |