summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-15 16:44:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-15 16:44:52 +0000
commita6cfa9892f79bfca668c432d1693612f897d3b01 (patch)
tree3b001a5cd5d6e8a298b5bd043e15ff6f56acc9c3 /luni
parentcfcb7ad5b68ad854ddbfe5ca1afcf85a1bb61f68 (diff)
parent4789598724fbf13a5d2e205c939358d9d87f6aef (diff)
downloadlibcore-a6cfa9892f79bfca668c432d1693612f897d3b01.zip
libcore-a6cfa9892f79bfca668c432d1693612f897d3b01.tar.gz
libcore-a6cfa9892f79bfca668c432d1693612f897d3b01.tar.bz2
Merge "Fix X509CertificateTest#test_Provider." into mnc-dev
Diffstat (limited to 'luni')
-rw-r--r--luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java b/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
index c35f8e6..14c22ef 100644
--- a/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
+++ b/luni/src/test/java/libcore/java/security/cert/X509CertificateTest.java
@@ -339,6 +339,13 @@ public class X509CertificateTest extends TestCase {
Provider[] providers = Security.getProviders("Signature." + c.getSigAlgName());
for (Provider p : providers) {
+ // Do not test AndroidKeyStore Provider. It does not accept vanilla public keys for
+ // signature verification. It's OKish not to test here because it's tested by
+ // cts/tests/tests/keystore.
+ if (p.getName().startsWith("AndroidKeyStore")) {
+ continue;
+ }
+
c.verify(signer, p.getName());
try {