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 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived | 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived |
6 // from AuthCertificateCallback() in | 6 // from AuthCertificateCallback() in |
7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. | 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. |
8 | 8 |
9 /* ***** BEGIN LICENSE BLOCK ***** | 9 /* ***** BEGIN LICENSE BLOCK ***** |
10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 #include "net/base/address_list.h" | 87 #include "net/base/address_list.h" |
88 #include "net/base/connection_type_histograms.h" | 88 #include "net/base/connection_type_histograms.h" |
89 #include "net/base/dns_util.h" | 89 #include "net/base/dns_util.h" |
90 #include "net/base/io_buffer.h" | 90 #include "net/base/io_buffer.h" |
91 #include "net/base/net_errors.h" | 91 #include "net/base/net_errors.h" |
92 #include "net/base/net_log.h" | 92 #include "net/base/net_log.h" |
93 #include "net/cert/asn1_util.h" | 93 #include "net/cert/asn1_util.h" |
94 #include "net/cert/cert_status_flags.h" | 94 #include "net/cert/cert_status_flags.h" |
95 #include "net/cert/cert_verifier.h" | 95 #include "net/cert/cert_verifier.h" |
96 #include "net/cert/ct_verifier.h" | 96 #include "net/cert/ct_verifier.h" |
| 97 #include "net/cert/sct_status_flags.h" |
97 #include "net/cert/single_request_cert_verifier.h" | 98 #include "net/cert/single_request_cert_verifier.h" |
98 #include "net/cert/x509_certificate_net_log_param.h" | 99 #include "net/cert/x509_certificate_net_log_param.h" |
99 #include "net/cert/x509_util.h" | 100 #include "net/cert/x509_util.h" |
100 #include "net/http/transport_security_state.h" | 101 #include "net/http/transport_security_state.h" |
101 #include "net/ocsp/nss_ocsp.h" | 102 #include "net/ocsp/nss_ocsp.h" |
102 #include "net/socket/client_socket_handle.h" | 103 #include "net/socket/client_socket_handle.h" |
103 #include "net/socket/nss_ssl_util.h" | 104 #include "net/socket/nss_ssl_util.h" |
104 #include "net/socket/ssl_error_params.h" | 105 #include "net/socket/ssl_error_params.h" |
105 #include "net/ssl/ssl_cert_request_info.h" | 106 #include "net/ssl/ssl_cert_request_info.h" |
106 #include "net/ssl/ssl_connection_status_flags.h" | 107 #include "net/ssl/ssl_connection_status_flags.h" |
(...skipping 2661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2768 // static | 2769 // static |
2769 void SSLClientSocket::ClearSessionCache() { | 2770 void SSLClientSocket::ClearSessionCache() { |
2770 // SSL_ClearSessionCache can't be called before NSS is initialized. Don't | 2771 // SSL_ClearSessionCache can't be called before NSS is initialized. Don't |
2771 // bother initializing NSS just to clear an empty SSL session cache. | 2772 // bother initializing NSS just to clear an empty SSL session cache. |
2772 if (!NSS_IsInitialized()) | 2773 if (!NSS_IsInitialized()) |
2773 return; | 2774 return; |
2774 | 2775 |
2775 SSL_ClearSessionCache(); | 2776 SSL_ClearSessionCache(); |
2776 } | 2777 } |
2777 | 2778 |
| 2779 void SSLClientSocketNSS::AddSCTInfoToSSLInfo(SSLInfo* ssl_info) const { |
| 2780 // XXX(alcutter): set status properly for unknown logs etc. too. |
| 2781 for (ct::SCTList::const_iterator iter = |
| 2782 ct_verify_result_.verified_scts.begin(); |
| 2783 iter != ct_verify_result_.verified_scts.end(); ++iter) { |
| 2784 ssl_info->scts.push_back(std::make_pair(*iter, net::kSctStatusOk)); |
| 2785 } |
| 2786 for (ct::SCTList::const_iterator iter = |
| 2787 ct_verify_result_.unverified_scts.begin(); |
| 2788 iter != ct_verify_result_.unverified_scts.end(); ++iter) { |
| 2789 ssl_info->scts.push_back(std::make_pair(*iter, |
| 2790 net::kSctStatusInvalid)); |
| 2791 } |
| 2792 } |
| 2793 |
2778 bool SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { | 2794 bool SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { |
2779 EnterFunction(""); | 2795 EnterFunction(""); |
2780 ssl_info->Reset(); | 2796 ssl_info->Reset(); |
2781 if (core_->state().server_cert_chain.empty() || | 2797 if (core_->state().server_cert_chain.empty() || |
2782 !core_->state().server_cert_chain[0]) { | 2798 !core_->state().server_cert_chain[0]) { |
2783 return false; | 2799 return false; |
2784 } | 2800 } |
2785 | 2801 |
2786 ssl_info->cert_status = server_cert_verify_result_.cert_status; | 2802 ssl_info->cert_status = server_cert_verify_result_.cert_status; |
2787 ssl_info->cert = server_cert_verify_result_.verified_cert; | 2803 ssl_info->cert = server_cert_verify_result_.verified_cert; |
| 2804 |
| 2805 AddSCTInfoToSSLInfo(ssl_info); |
| 2806 |
2788 ssl_info->connection_status = | 2807 ssl_info->connection_status = |
2789 core_->state().ssl_connection_status; | 2808 core_->state().ssl_connection_status; |
2790 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; | 2809 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; |
2791 for (HashValueVector::const_iterator i = side_pinned_public_keys_.begin(); | 2810 for (HashValueVector::const_iterator i = side_pinned_public_keys_.begin(); |
2792 i != side_pinned_public_keys_.end(); ++i) { | 2811 i != side_pinned_public_keys_.end(); ++i) { |
2793 ssl_info->public_key_hashes.push_back(*i); | 2812 ssl_info->public_key_hashes.push_back(*i); |
2794 } | 2813 } |
2795 ssl_info->is_issued_by_known_root = | 2814 ssl_info->is_issued_by_known_root = |
2796 server_cert_verify_result_.is_issued_by_known_root; | 2815 server_cert_verify_result_.is_issued_by_known_root; |
2797 ssl_info->client_cert_sent = | 2816 ssl_info->client_cert_sent = |
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3534 EnsureThreadIdAssigned(); | 3553 EnsureThreadIdAssigned(); |
3535 base::AutoLock auto_lock(lock_); | 3554 base::AutoLock auto_lock(lock_); |
3536 return valid_thread_id_ == base::PlatformThread::CurrentId(); | 3555 return valid_thread_id_ == base::PlatformThread::CurrentId(); |
3537 } | 3556 } |
3538 | 3557 |
3539 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { | 3558 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { |
3540 return server_bound_cert_service_; | 3559 return server_bound_cert_service_; |
3541 } | 3560 } |
3542 | 3561 |
3543 } // namespace net | 3562 } // namespace net |
OLD | NEW |