Merge changes I97a8f820,Ifd02328f
am: 9504023228
* commit '9504023228f92f80113e3fd2f8d93748e2ee14d8':
Add missing test cert
Add policy checking info
diff --git a/res/tests/resources/nist-pkits/certs/RFC3280OptionalAttributeTypesCACert.crt b/res/tests/resources/nist-pkits/certs/RFC3280OptionalAttributeTypesCACert.crt
new file mode 100644
index 0000000..306303a
--- /dev/null
+++ b/res/tests/resources/nist-pkits/certs/RFC3280OptionalAttributeTypesCACert.crt
Binary files differ
diff --git a/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java b/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java
index bf98698..5171a64 100644
--- a/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java
+++ b/src/libcore/java/security/cert/X509CertificateNistPkitsTest.java
@@ -36,12 +36,14 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import junit.framework.TestCase;
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/";
public static InputStream getStream(String name) {
@@ -140,6 +142,10 @@
PKIXParameters params = new PKIXParameters(anchors);
params.addCertStore(certStore);
+ params.setExplicitPolicyRequired(false);
+ params.setInitialPolicies(Collections.singleton(ANY_POLICY_OID));
+ params.setPolicyMappingInhibited(false);
+ params.setAnyPolicyInhibited(false);
return params;
}
