summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-15 09:18:21 -0700
committerAlex Klyubin <klyubin@google.com>2015-06-15 09:20:29 -0700
commit4789598724fbf13a5d2e205c939358d9d87f6aef (patch)
treee70246ea6c552bc7732683f8e207a77c6bfa1f72 /luni
parent9d835973b665a7bcf4601358b44fe2c4a3b833c2 (diff)
downloadlibcore-4789598724fbf13a5d2e205c939358d9d87f6aef.zip
libcore-4789598724fbf13a5d2e205c939358d9d87f6aef.tar.gz
libcore-4789598724fbf13a5d2e205c939358d9d87f6aef.tar.bz2
Fix X509CertificateTest#test_Provider.
The test got broken by AndroidKeyStore Provider exposing a Signature implementation which does not accept vanilla public keys -- it only accepts AndroidKeyStore Provider's public keys. The fix is to skip AndroidKeyStore Provider in this test. Bug: 21814211 Change-Id: If6a2241d6e3292ab9de94d14a24fd958eeb1cbf5
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 {