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

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

Issue 10826257: Implement SHA-256 fingerprint support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2745 matching lines...) Expand 10 before | Expand all | Expand 10 after
2756 if (core_->state().server_cert_chain.empty() || 2756 if (core_->state().server_cert_chain.empty() ||
2757 !core_->state().server_cert_chain[0]) { 2757 !core_->state().server_cert_chain[0]) {
2758 return false; 2758 return false;
2759 } 2759 }
2760 2760
2761 ssl_info->cert_status = server_cert_verify_result_.cert_status; 2761 ssl_info->cert_status = server_cert_verify_result_.cert_status;
2762 ssl_info->cert = server_cert_verify_result_.verified_cert; 2762 ssl_info->cert = server_cert_verify_result_.verified_cert;
2763 ssl_info->connection_status = 2763 ssl_info->connection_status =
2764 core_->state().ssl_connection_status; 2764 core_->state().ssl_connection_status;
2765 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes; 2765 ssl_info->public_key_hashes = server_cert_verify_result_.public_key_hashes;
2766 for (std::vector<SHA1Fingerprint>::const_iterator 2766 for (HashValueVector::const_iterator i = side_pinned_public_keys_.begin();
2767 i = side_pinned_public_keys_.begin(); 2767 i != side_pinned_public_keys_.end(); ++i) {
2768 i != side_pinned_public_keys_.end(); i++) {
2769 ssl_info->public_key_hashes.push_back(*i); 2768 ssl_info->public_key_hashes.push_back(*i);
2770 } 2769 }
2771 ssl_info->is_issued_by_known_root = 2770 ssl_info->is_issued_by_known_root =
2772 server_cert_verify_result_.is_issued_by_known_root; 2771 server_cert_verify_result_.is_issued_by_known_root;
2773 ssl_info->client_cert_sent = 2772 ssl_info->client_cert_sent =
2774 ssl_config_.send_client_cert && ssl_config_.client_cert; 2773 ssl_config_.send_client_cert && ssl_config_.client_cert;
2775 ssl_info->channel_id_sent = WasChannelIDSent(); 2774 ssl_info->channel_id_sent = WasChannelIDSent();
2776 2775
2777 PRUint16 cipher_suite = SSLConnectionStatusToCipherSuite( 2776 PRUint16 cipher_suite = SSLConnectionStatusToCipherSuite(
2778 core_->state().ssl_connection_status); 2777 core_->state().ssl_connection_status);
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 EnsureThreadIdAssigned(); 3507 EnsureThreadIdAssigned();
3509 base::AutoLock auto_lock(lock_); 3508 base::AutoLock auto_lock(lock_);
3510 return valid_thread_id_ == base::PlatformThread::CurrentId(); 3509 return valid_thread_id_ == base::PlatformThread::CurrentId();
3511 } 3510 }
3512 3511
3513 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { 3512 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
3514 return server_bound_cert_service_; 3513 return server_bound_cert_service_;
3515 } 3514 }
3516 3515
3517 } // namespace net 3516 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698