Index: net/socket/ssl_client_socket_nss.cc |
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc |
index 3e5bde05fa7ce8a8619b29dae69c7181192147df..945e64400a14a11aae7fab9820bb08fa5bbb6b35 100644 |
--- a/net/socket/ssl_client_socket_nss.cc |
+++ b/net/socket/ssl_client_socket_nss.cc |
@@ -91,6 +91,7 @@ |
#include "net/base/net_errors.h" |
#include "net/base/net_log.h" |
#include "net/cert/asn1_util.h" |
+#include "net/cert/cert_policy_enforcer.h" |
#include "net/cert/cert_status_flags.h" |
#include "net/cert/cert_verifier.h" |
#include "net/cert/ct_ev_whitelist.h" |
@@ -2834,6 +2835,7 @@ SSLClientSocketNSS::SSLClientSocketNSS( |
nss_fd_(NULL), |
net_log_(transport_->socket()->NetLog()), |
transport_security_state_(context.transport_security_state), |
+ policy_enforcer_(context.cert_policy_enforcer), |
valid_thread_id_(base::kInvalidThreadId) { |
EnterFunction(""); |
InitCore(); |
@@ -3518,21 +3520,6 @@ int SSLClientSocketNSS::DoVerifyCertComplete(int result) { |
result = ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN; |
} |
- scoped_refptr<ct::EVCertsWhitelist> ev_whitelist = |
- SSLConfigService::GetEVCertsWhitelist(); |
- if (server_cert_verify_result_.cert_status & CERT_STATUS_IS_EV) { |
- if (ev_whitelist.get() && ev_whitelist->IsValid()) { |
- const SHA256HashValue fingerprint( |
- X509Certificate::CalculateFingerprint256( |
- server_cert_verify_result_.verified_cert->os_cert_handle())); |
- |
- UMA_HISTOGRAM_BOOLEAN( |
- "Net.SSL_EVCertificateInWhitelist", |
- ev_whitelist->ContainsCertificateHash( |
- std::string(reinterpret_cast<const char*>(fingerprint.data), 8))); |
- } |
- } |
- |
if (result == OK) { |
// Only check Certificate Transparency if there were no other errors with |
// the connection. |
@@ -3570,6 +3557,24 @@ void SSLClientSocketNSS::VerifyCT() { |
<< " Verified scts: " << ct_verify_result_.verified_scts.size() |
<< " scts from unknown logs: " |
<< ct_verify_result_.unknown_logs_scts.size(); |
Ryan Sleevi
2014/11/28 15:27:44
This is all NetLogged right now - we should be nuk
Eran Messeri
2014/12/01 13:59:03
Done.
|
+ |
+ if (!policy_enforcer_) { |
+ server_cert_verify_result_.cert_status &= ~CERT_STATUS_IS_EV; |
+ } else { |
+ if (server_cert_verify_result_.cert_status & CERT_STATUS_IS_EV) { |
+ scoped_refptr<ct::EVCertsWhitelist> ev_whitelist = |
+ SSLConfigService::GetEVCertsWhitelist(); |
+ if (!policy_enforcer_->DoesConformToCTEVPolicy( |
+ server_cert_verify_result_.verified_cert.get(), |
+ ev_whitelist.get(), ct_verify_result_)) { |
+ VLOG(1) << "EV certificate for " |
+ << server_cert_verify_result_.verified_cert->subject() |
+ .GetDisplayName() |
+ << " does not conform to CT policy, removing EV status."; |
Ryan Sleevi
2014/11/28 15:27:44
NetLog
Eran Messeri
2014/12/01 13:59:03
Done (added TODO with bug#).
|
+ server_cert_verify_result_.cert_status &= ~CERT_STATUS_IS_EV; |
+ } |
+ } |
+ } |
} |
void SSLClientSocketNSS::EnsureThreadIdAssigned() const { |