Skip to content

Commit

Permalink
CertVerifyProcConstraintsTest: add validity tests
Browse files Browse the repository at this point in the history
Bug: 1370748
Change-Id: I1e4437749f9c261541b4c8163e53eb877eb1c1c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3999974
Reviewed-by: David Benjamin <davidben@chromium.org>
Commit-Queue: Matt Mueller <mattm@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1067912}
  • Loading branch information
matt-mueller authored and Chromium LUCI CQ committed Nov 6, 2022
1 parent 524cd13 commit 91e30a8
Showing 1 changed file with 42 additions and 0 deletions.
42 changes: 42 additions & 0 deletions net/cert/cert_verify_proc_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4314,6 +4314,20 @@ class CertVerifyProcConstraintsTest : public CertVerifyProcInternalTest {
return ERR_CERT_INVALID;
}

int ExpectedRootExpiredError() {
if (VerifyProcTypeIsBuiltin() ||
verify_proc_type() == CERT_VERIFY_PROC_ANDROID) {
return OK;
}
return ERR_CERT_DATE_INVALID;
}

int ExpectedIntermediateExpiredError() {
if (verify_proc_type() == CERT_VERIFY_PROC_ANDROID)
return ERR_CERT_AUTHORITY_INVALID;
return ERR_CERT_DATE_INVALID;
}

std::vector<std::unique_ptr<CertBuilder>> chain_;
};

Expand Down Expand Up @@ -4410,6 +4424,34 @@ TEST_P(CertVerifyProcConstraintsTest, NameConstraintsMatchingIntermediate) {
EXPECT_THAT(Verify(), IsOk());
}

TEST_P(CertVerifyProcConstraintsTest, ValidityExpiredRoot) {
chain_[3]->SetValidity(base::Time::Now() - base::Days(14),
base::Time::Now() - base::Days(7));

EXPECT_THAT(Verify(), IsError(ExpectedRootExpiredError()));
}

TEST_P(CertVerifyProcConstraintsTest, ValidityNotYetValidRoot) {
chain_[3]->SetValidity(base::Time::Now() + base::Days(7),
base::Time::Now() + base::Days(14));

EXPECT_THAT(Verify(), IsError(ExpectedRootExpiredError()));
}

TEST_P(CertVerifyProcConstraintsTest, ValidityExpiredIntermediate) {
chain_[2]->SetValidity(base::Time::Now() - base::Days(14),
base::Time::Now() - base::Days(7));

EXPECT_THAT(Verify(), IsError(ExpectedIntermediateExpiredError()));
}

TEST_P(CertVerifyProcConstraintsTest, ValidityNotYetValidIntermediate) {
chain_[2]->SetValidity(base::Time::Now() + base::Days(7),
base::Time::Now() + base::Days(14));

EXPECT_THAT(Verify(), IsError(ExpectedIntermediateExpiredError()));
}

TEST(CertVerifyProcTest, RejectsPublicSHA1Leaves) {
scoped_refptr<X509Certificate> cert(
ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
Expand Down

0 comments on commit 91e30a8

Please sign in to comment.