OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "net/quic/chromium/crypto/proof_verifier_chromium.h" | 5 #include "net/quic/chromium/crypto/proof_verifier_chromium.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 } | 419 } |
420 } | 420 } |
421 | 421 |
422 verify_details_->ct_verify_result.cert_policy_compliance = | 422 verify_details_->ct_verify_result.cert_policy_compliance = |
423 policy_enforcer_->DoesConformToCertPolicy( | 423 policy_enforcer_->DoesConformToCertPolicy( |
424 cert_verify_result.verified_cert.get(), verified_scts, net_log_); | 424 cert_verify_result.verified_cert.get(), verified_scts, net_log_); |
425 | 425 |
426 int ct_result = OK; | 426 int ct_result = OK; |
427 if (verify_details_->ct_verify_result.cert_policy_compliance != | 427 if (verify_details_->ct_verify_result.cert_policy_compliance != |
428 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && | 428 ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS && |
| 429 verify_details_->ct_verify_result.cert_policy_compliance != |
| 430 ct::CertPolicyCompliance::CERT_POLICY_BUILD_NOT_TIMELY && |
429 transport_security_state_->ShouldRequireCT( | 431 transport_security_state_->ShouldRequireCT( |
430 hostname_, cert_verify_result.verified_cert.get(), | 432 hostname_, cert_verify_result.verified_cert.get(), |
431 cert_verify_result.public_key_hashes)) { | 433 cert_verify_result.public_key_hashes)) { |
432 verify_details_->cert_verify_result.cert_status |= | 434 verify_details_->cert_verify_result.cert_status |= |
433 CERT_STATUS_CERTIFICATE_TRANSPARENCY_REQUIRED; | 435 CERT_STATUS_CERTIFICATE_TRANSPARENCY_REQUIRED; |
434 ct_result = ERR_CERTIFICATE_TRANSPARENCY_REQUIRED; | 436 ct_result = ERR_CERTIFICATE_TRANSPARENCY_REQUIRED; |
435 } | 437 } |
436 | 438 |
437 TransportSecurityState::PKPStatus pin_validity = | 439 TransportSecurityState::PKPStatus pin_validity = |
438 transport_security_state_->CheckPublicKeyPins( | 440 transport_security_state_->CheckPublicKeyPins( |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 active_jobs_.insert(job.release()); | 616 active_jobs_.insert(job.release()); |
615 return status; | 617 return status; |
616 } | 618 } |
617 | 619 |
618 void ProofVerifierChromium::OnJobComplete(Job* job) { | 620 void ProofVerifierChromium::OnJobComplete(Job* job) { |
619 active_jobs_.erase(job); | 621 active_jobs_.erase(job); |
620 delete job; | 622 delete job; |
621 } | 623 } |
622 | 624 |
623 } // namespace net | 625 } // namespace net |
OLD | NEW |