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

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

Issue 547603002: Certificate Transparency: Code for unpacking EV cert hashes whitelist (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing review comments. Created 6 years, 1 month 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
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 #include "crypto/scoped_nss_types.h" 87 #include "crypto/scoped_nss_types.h"
88 #include "net/base/address_list.h" 88 #include "net/base/address_list.h"
89 #include "net/base/connection_type_histograms.h" 89 #include "net/base/connection_type_histograms.h"
90 #include "net/base/dns_util.h" 90 #include "net/base/dns_util.h"
91 #include "net/base/io_buffer.h" 91 #include "net/base/io_buffer.h"
92 #include "net/base/net_errors.h" 92 #include "net/base/net_errors.h"
93 #include "net/base/net_log.h" 93 #include "net/base/net_log.h"
94 #include "net/cert/asn1_util.h" 94 #include "net/cert/asn1_util.h"
95 #include "net/cert/cert_status_flags.h" 95 #include "net/cert/cert_status_flags.h"
96 #include "net/cert/cert_verifier.h" 96 #include "net/cert/cert_verifier.h"
97 #include "net/cert/ct_objects_extractor.h" 97 #include "net/cert/ct_ev_whitelist.h"
98 #include "net/cert/ct_verifier.h" 98 #include "net/cert/ct_verifier.h"
99 #include "net/cert/ct_verify_result.h" 99 #include "net/cert/ct_verify_result.h"
100 #include "net/cert/scoped_nss_types.h" 100 #include "net/cert/scoped_nss_types.h"
101 #include "net/cert/sct_status_flags.h" 101 #include "net/cert/sct_status_flags.h"
102 #include "net/cert/single_request_cert_verifier.h" 102 #include "net/cert/single_request_cert_verifier.h"
103 #include "net/cert/x509_certificate_net_log_param.h" 103 #include "net/cert/x509_certificate_net_log_param.h"
104 #include "net/cert/x509_util.h" 104 #include "net/cert/x509_util.h"
105 #include "net/http/transport_security_state.h" 105 #include "net/http/transport_security_state.h"
106 #include "net/ocsp/nss_ocsp.h" 106 #include "net/ocsp/nss_ocsp.h"
107 #include "net/socket/client_socket_handle.h" 107 #include "net/socket/client_socket_handle.h"
(...skipping 3373 matching lines...) Expand 10 before | Expand all | Expand 10 after
3481 (result == OK || 3481 (result == OK ||
3482 (IsCertificateError(result) && IsCertStatusMinorError(cert_status))) && 3482 (IsCertificateError(result) && IsCertStatusMinorError(cert_status))) &&
3483 !transport_security_state_->CheckPublicKeyPins( 3483 !transport_security_state_->CheckPublicKeyPins(
3484 host_and_port_.host(), 3484 host_and_port_.host(),
3485 server_cert_verify_result_.is_issued_by_known_root, 3485 server_cert_verify_result_.is_issued_by_known_root,
3486 server_cert_verify_result_.public_key_hashes, 3486 server_cert_verify_result_.public_key_hashes,
3487 &pinning_failure_log_)) { 3487 &pinning_failure_log_)) {
3488 result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN; 3488 result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN;
3489 } 3489 }
3490 3490
3491 scoped_refptr<ct::EVCertsWhitelist> ev_whitelist =
3492 SSLConfigService::GetEVCertsWhitelist();
3493 if (server_cert_verify_result_.cert_status & CERT_STATUS_IS_EV) {
3494 if (ev_whitelist.get() && ev_whitelist->IsValid()) {
3495 const SHA256HashValue fingerprint(
3496 X509Certificate::CalculateFingerprint256(
3497 server_cert_verify_result_.verified_cert->os_cert_handle()));
3498
3499 UMA_HISTOGRAM_BOOLEAN(
3500 "Net.SSL_EVCertificateInWhitelist",
3501 ev_whitelist->ContainsCertificateHash(
3502 std::string(reinterpret_cast<const char*>(fingerprint.data), 8)));
3503 }
3504 }
3505
3491 if (result == OK) { 3506 if (result == OK) {
3492 // Only check Certificate Transparency if there were no other errors with 3507 // Only check Certificate Transparency if there were no other errors with
3493 // the connection. 3508 // the connection.
3494 VerifyCT(); 3509 VerifyCT();
3495 3510
3496 // Only cache the session if the certificate verified successfully. 3511 // Only cache the session if the certificate verified successfully.
3497 core_->CacheSessionIfNecessary(); 3512 core_->CacheSessionIfNecessary();
3498 } 3513 }
3499 3514
3500 completed_handshake_ = true; 3515 completed_handshake_ = true;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
3588 scoped_refptr<X509Certificate> 3603 scoped_refptr<X509Certificate>
3589 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { 3604 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const {
3590 return core_->state().server_cert.get(); 3605 return core_->state().server_cert.get();
3591 } 3606 }
3592 3607
3593 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { 3608 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const {
3594 return channel_id_service_; 3609 return channel_id_service_;
3595 } 3610 }
3596 3611
3597 } // namespace net 3612 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698