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

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

Issue 10545166: Support SHA-256 in public key pins for HTTPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months 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 | Annotate | Revision Log
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 // 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 2848 matching lines...) Expand 10 before | Expand all | Expand 10 after
2859 if (core_->state().server_cert_chain.empty() || 2859 if (core_->state().server_cert_chain.empty() ||
2860 !core_->state().server_cert_chain[0]) { 2860 !core_->state().server_cert_chain[0]) {
2861 return; 2861 return;
2862 } 2862 }
2863 2863
2864 ssl_info->cert_status = server_cert_verify_result_->cert_status; 2864 ssl_info->cert_status = server_cert_verify_result_->cert_status;
2865 ssl_info->cert = server_cert_verify_result_->verified_cert; 2865 ssl_info->cert = server_cert_verify_result_->verified_cert;
2866 ssl_info->connection_status = 2866 ssl_info->connection_status =
2867 core_->state().ssl_connection_status; 2867 core_->state().ssl_connection_status;
2868 ssl_info->public_key_hashes = server_cert_verify_result_->public_key_hashes; 2868 ssl_info->public_key_hashes = server_cert_verify_result_->public_key_hashes;
2869 for (std::vector<SHA1Fingerprint>::const_iterator 2869 for (std::vector<Fingerprint>::const_iterator
2870 i = side_pinned_public_keys_.begin(); 2870 i = side_pinned_public_keys_.begin();
2871 i != side_pinned_public_keys_.end(); i++) { 2871 i != side_pinned_public_keys_.end(); i++) {
2872 ssl_info->public_key_hashes.push_back(*i); 2872 ssl_info->public_key_hashes.push_back(*i);
2873 } 2873 }
2874 ssl_info->is_issued_by_known_root = 2874 ssl_info->is_issued_by_known_root =
2875 server_cert_verify_result_->is_issued_by_known_root; 2875 server_cert_verify_result_->is_issued_by_known_root;
2876 ssl_info->client_cert_sent = WasDomainBoundCertSent() || 2876 ssl_info->client_cert_sent = WasDomainBoundCertSent() ||
2877 (ssl_config_.send_client_cert && ssl_config_.client_cert); 2877 (ssl_config_.send_client_cert && ssl_config_.client_cert);
2878 2878
2879 PRUint16 cipher_suite = SSLConnectionStatusToCipherSuite( 2879 PRUint16 cipher_suite = SSLConnectionStatusToCipherSuite(
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
3715 EnsureThreadIdAssigned(); 3715 EnsureThreadIdAssigned();
3716 base::AutoLock auto_lock(lock_); 3716 base::AutoLock auto_lock(lock_);
3717 return valid_thread_id_ == base::PlatformThread::CurrentId(); 3717 return valid_thread_id_ == base::PlatformThread::CurrentId();
3718 } 3718 }
3719 3719
3720 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3720 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3721 return server_bound_cert_service_; 3721 return server_bound_cert_service_;
3722 } 3722 }
3723 3723
3724 } // namespace net 3724 } // namespace net
OLDNEW
« net/base/x509_cert_types.h ('K') | « net/socket/ssl_client_socket_nss.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698