Use TSPTestUtil instead of CMSTestUtil

Author: peterdettman

pkix/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java

@@ -63,7 +63,6 @@
 import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
 import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
 import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.test.CMSTestUtil;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
 import org.bouncycastle.operator.ContentSigner;
@@ -148,15 +147,15 @@ public void testCertOrdering()
         List            certList = new ArrayList();
 
         String _origDN   = "O=Bouncy Castle, C=AU";
-        KeyPair _origKP   = CMSTestUtil.makeKeyPair();
-        X509Certificate _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _origKP, _origDN);
+        KeyPair _origKP   = TSPTestUtil.makeKeyPair();
+        X509Certificate _origCert = TSPTestUtil.makeCertificate(_origKP, _origDN, _origKP, _origDN);
 
         String _signDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-        KeyPair _signKP   = CMSTestUtil.makeKeyPair();
+        KeyPair _signKP   = TSPTestUtil.makeKeyPair();
         X509Certificate _signCert = TSPTestUtil.makeCertificate(_signKP, _signDN, _origKP, _origDN);
 
-        KeyPair _signDsaKP   = CMSTestUtil.makeDsaKeyPair();
-        X509Certificate _signDsaCert = CMSTestUtil.makeCertificate(_signDsaKP, _signDN, _origKP, _origDN);
+        KeyPair _signDsaKP   = TSPTestUtil.makeDsaKeyPair();
+        X509Certificate _signDsaCert = TSPTestUtil.makeCertificate(_signDsaKP, _signDN, _origKP, _origDN);
 
         certList.add(_origCert);
         certList.add(_signDsaCert);

pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java

@@ -8,6 +8,7 @@
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
+import java.security.spec.DSAParameterSpec;
 import java.util.Date;
 
 import javax.crypto.KeyGenerator;
@@ -37,6 +38,8 @@ public class TSPTestUtil
 
     public static KeyPairGenerator kpg;
 
+    public static KeyPairGenerator dsaKpg;
+
     public static KeyGenerator desede128kg;
 
     public static KeyGenerator desede192kg;
@@ -65,6 +68,14 @@ public class TSPTestUtil
             kpg = KeyPairGenerator.getInstance("RSA", "BC");
             kpg.initialize(1024, rand);
 
+            dsaKpg = KeyPairGenerator.getInstance("DSA", "BC");
+            DSAParameterSpec dsaSpec = new DSAParameterSpec(
+                new BigInteger("7434410770759874867539421675728577177024889699586189000788950934679315164676852047058354758883833299702695428196962057871264685291775577130504050839126673"),
+                new BigInteger("1138656671590261728308283492178581223478058193247"),
+                new BigInteger("4182906737723181805517018315469082619513954319976782448649747742951189003482834321192692620856488639629011570381138542789803819092529658402611668375788410"));
+
+            dsaKpg.initialize(dsaSpec, new SecureRandom());
+
             desede128kg = KeyGenerator.getInstance("DESEDE", "BC");
             desede128kg.init(112, rand);
 
@@ -118,6 +129,11 @@ public static KeyPair makeKeyPair()
         return kpg.generateKeyPair();
     }
 
+    public static KeyPair makeDsaKeyPair()
+    {
+        return dsaKpg.generateKeyPair();
+    }
+
     public static SecretKey makeDesede128Key()
     {
         return desede128kg.generateKey();