diff options
author | Kenny Root <kroot@google.com> | 2016-01-30 16:30:10 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-30 16:30:10 +0000 |
commit | 89fb1b9fdc7f5c48d4983fad62af62c1b780e428 (patch) | |
tree | 6639c071565d79322deed60a5c56399c0b908bb9 | |
parent | ac3b94e23d2d90df8ad407541ee61a687f888e99 (diff) | |
parent | d81b74592a89e17a8e695751d7327f5ae7dd667c (diff) | |
download | nist-pkits-89fb1b9fdc7f5c48d4983fad62af62c1b780e428.tar.gz |
Merge "Set date on path verification parameters"android-n-mr1-preview-2android-n-mr1-preview-1android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releasenougat-dev
am: d81b74592a
* commit 'd81b74592a89e17a8e695751d7327f5ae7dd667c':
Set date on path verification parameters
-rw-r--r-- | src/libcore/java/security/cert/X509CertificateNistPkitsTest.java | 17 |
1 files changed, 17 insertions, 0 deletions
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; } |