From 4789598724fbf13a5d2e205c939358d9d87f6aef Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Mon, 15 Jun 2015 09:18:21 -0700 Subject: 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 --- .../test/java/libcore/java/security/cert/X509CertificateTest.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 { -- cgit v1.1