| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/cert/ct_policy_enforcer.h" | 5 #include "net/cert/ct_policy_enforcer.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 verified_scts); | 130 verified_scts); |
| 131 } | 131 } |
| 132 | 132 |
| 133 protected: | 133 protected: |
| 134 std::unique_ptr<CTPolicyEnforcer> policy_enforcer_; | 134 std::unique_ptr<CTPolicyEnforcer> policy_enforcer_; |
| 135 scoped_refptr<X509Certificate> chain_; | 135 scoped_refptr<X509Certificate> chain_; |
| 136 std::string google_log_id_; | 136 std::string google_log_id_; |
| 137 std::string non_google_log_id_; | 137 std::string non_google_log_id_; |
| 138 }; | 138 }; |
| 139 | 139 |
| 140 #if defined(OS_ANDROID) |
| 141 #define MAYBE_DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle \ |
| 142 DISABLED_DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle |
| 143 #else |
| 144 #define MAYBE_DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle \ |
| 145 DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle |
| 146 #endif |
| 140 TEST_F(CTPolicyEnforcerTest, | 147 TEST_F(CTPolicyEnforcerTest, |
| 141 DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle) { | 148 MAYBE_DoesNotConformToCTEVPolicyNotEnoughDiverseSCTsAllGoogle) { |
| 142 ct::SCTList scts; | 149 ct::SCTList scts; |
| 143 std::vector<std::string> desired_log_ids(2, google_log_id_); | 150 std::vector<std::string> desired_log_ids(2, google_log_id_); |
| 144 | 151 |
| 145 FillListWithSCTsOfOrigin( | 152 FillListWithSCTsOfOrigin( |
| 146 ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, | 153 ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, |
| 147 desired_log_ids.size(), desired_log_ids, true, &scts); | 154 desired_log_ids.size(), desired_log_ids, true, &scts); |
| 148 | 155 |
| 149 EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS, | 156 EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS, |
| 150 policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts, | 157 policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts, |
| 151 NetLogWithSource())); | 158 NetLogWithSource())); |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 2, | 569 FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 2, |
| 563 &scts); | 570 &scts); |
| 564 EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS, | 571 EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS, |
| 565 policy_enforcer_->DoesConformToCTEVPolicy( | 572 policy_enforcer_->DoesConformToCTEVPolicy( |
| 566 chain_.get(), nullptr, scts, NetLogWithSource())); | 573 chain_.get(), nullptr, scts, NetLogWithSource())); |
| 567 } | 574 } |
| 568 | 575 |
| 569 } // namespace | 576 } // namespace |
| 570 | 577 |
| 571 } // namespace net | 578 } // namespace net |
| OLD | NEW |