commit 83b02fe90cad9b5f350de470ebe5013078982c7a
author Narayan Kamath <narayan@google.com> Mon Jun 15 16:48:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 15 16:48:47 2015 +0000
tree 7c51b86078a31b5c516a597cd1820a33f659e4f0
parent bba8e66b06333576e4d8026092d43cb58f722d31
parent b8d35e505fe7550135e6707cb25772fad3986da1

Merge "Fix CertificateTest#testVerifyPublicKeyString2"

luni/src/test/java/tests/security/cert/CertificateTest.java

diff --git a/luni/src/test/java/tests/security/cert/CertificateTest.java b/luni/src/test/java/tests/security/cert/CertificateTest.java
index d13e16b..194bfdb 100644
--- a/luni/src/test/java/tests/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateTest.java
@@ -300,17 +300,10 @@
 
     private Certificate cert;
 
-    private Provider wrongProvider;
-
-    private Provider usefulProvider;
-
     public void setUp() throws Exception {
         super.setUp();
         TestUtils.initCertPathSSCertChain();
         cert = TestUtils.rootCertificateSS;
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        wrongProvider = cf.getProvider();
-        usefulProvider = Signature.getInstance("SHA1WithRSA").getProvider();
     }
 
     /**
@@ -326,8 +319,11 @@
             CertificateException, NoSuchAlgorithmException,
             NoSuchProviderException, SignatureException {
 
+        final Signature sig = Signature.getInstance("SHA1WithRSA");
+        sig.initVerify(cert.getPublicKey());
+        final Provider provider = sig.getProvider();
         // real test
-        cert.verify(cert.getPublicKey(), usefulProvider.getName());
+        cert.verify(cert.getPublicKey(), provider.getName());
 
         // Exception tests
 
@@ -342,6 +338,9 @@
         // a new provider, test if it works, then remove it and test if the
         // exception is thrown.
         //
+        // CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        // Provider wrongProvider = cf.getProvider();
+        //
         // Security.removeProvider(wrongProvider.getName());
         //
         // try {