From 0afe96ad6246d9e8c56d50a925dad6cad0feff22 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 29 Jan 2016 15:54:31 -0800 Subject: Set date on path verification parameters To avoid flaky tests (e.g., device date is not correct), we should set a date on the PKIX path verification parameters. Bug: 26716600 Change-Id: Ie7c18c9cff63b2c8ea4bb050593d79db39401dd8 --- .../security/cert/X509CertificateNistPkitsTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java b/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java index d9a81c5..052b6ab 100644 --- a/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java +++ b/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java @@ -35,10 +35,13 @@ import java.security.cert.X509CRL; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.Set; +import java.util.TimeZone; import junit.framework.TestCase; @@ -46,6 +49,19 @@ public class X509CertificateNistPkitsTest extends TestCase { public static final String ANY_POLICY_OID = "2.5.29.32.0"; public static final String RESOURCE_PACKAGE = "/tests/resources/"; + /* + * All the certificates in this test should be verified with the same date. + * Since none of the built-in roots-of-trust (CA cerificates) are needed, + * it should be safe to set this to a fixed date until the certificates + * in the tests are updated. + */ + private static final Date TEST_DATE; + static { + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); + cal.set(2015, 0, 1); + TEST_DATE = cal.getTime(); + } + public static InputStream getStream(String name) { // If we have the resources packaged up in our jar file, get them that way. String path = RESOURCE_PACKAGE + name; @@ -146,6 +162,7 @@ public class X509CertificateNistPkitsTest extends TestCase { params.setInitialPolicies(Collections.singleton(ANY_POLICY_OID)); params.setPolicyMappingInhibited(false); params.setAnyPolicyInhibited(false); + params.setDate(TEST_DATE); return params; } -- cgit v1.2.3