install BC provider in tests...

9 files changed, 23 insertions, 15 deletions

diff --git a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java
index 3e0350aab..c027a0cb9 100644
--- a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java
+++ b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java
@@ -5,6 +5,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.security.KeyPair;
 import java.security.MessageDigest;
+import java.security.Security;
 import java.security.cert.CertStore;
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.X509CRL;
@@ -65,6 +66,7 @@ public class MiscDataStreamTest
         if (!_initialised)
         {
             _initialised = true;
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
 
             _signDN   = "O=Bouncy Castle, C=AU";
             _signKP   = CMSTestUtil.makeKeyPair();
diff --git a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataStreamTest.java b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataStreamTest.java
index 39b50da91..83304c89d 100644
--- a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataStreamTest.java
+++ b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataStreamTest.java
@@ -4,10 +4,7 @@ import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.security.*;
 import java.security.cert.CertStore;
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.X509CRL;
@@ -88,6 +85,7 @@ public class SignedDataStreamTest
         if (!_initialised)
         {
             _initialised = true;
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
             
             _signDN   = "O=Bouncy Castle, C=AU";
             _signKP   = CMSTestUtil.makeKeyPair();  
diff --git a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataTest.java b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataTest.java
index 160669bc9..f15c1d9d7 100644
--- a/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataTest.java
+++ b/bcmail-jdk15on/src/test/java/org/bouncycastle/cms/test/SignedDataTest.java
@@ -2,10 +2,7 @@ package org.bouncycastle.cms.test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.security.*;
 import java.security.cert.CertStore;
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.X509CRL;
@@ -420,7 +417,8 @@ public class SignedDataTest
         if (!_initialised)
         {
             _initialised = true;
-            
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+
             _origDN   = "O=Bouncy Castle, C=AU";
             _origKP   = CMSTestUtil.makeKeyPair();  
             _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _origKP, _origDN);
diff --git a/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java b/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java
index 812133959..010599bdf 100644
--- a/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java
+++ b/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java
@@ -9,6 +9,7 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.security.KeyPair;
 import java.security.MessageDigest;
+import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -103,6 +104,7 @@ public class NewSMIMESignedTest
 
     static
     {
+    	Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
         try
         {
             msg      = SMIMETestUtil.makeMimeBodyPart("Hello world!\n");
diff --git a/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java b/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java
index 3a6e8168a..2b364cc5d 100644
--- a/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java
+++ b/bcmail-jdk15on/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java
@@ -9,6 +9,7 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.security.KeyPair;
 import java.security.MessageDigest;
+import java.security.Security;
 import java.security.cert.CertStore;
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.X509Certificate;
@@ -101,6 +102,7 @@ public class SMIMESignedTest
     
     static
     {
+    	Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
         try
         {
             msg      = SMIMETestUtil.makeMimeBodyPart("Hello world!\n");
diff --git a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java
index e56220e28..b0cff1cb4 100644
--- a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java
+++ b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java
@@ -3,6 +3,7 @@ package org.bouncycastle.tsp.test;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.PrivateKey;
+import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -45,6 +46,7 @@ public class NewTSPTest
     public void testGeneral()
         throws Exception
     {
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
             String signDN = "O=Bouncy Castle, C=AU";
             KeyPair signKP = TSPTestUtil.makeKeyPair();
             X509Certificate signCert = TSPTestUtil.makeCACertificate(signKP,
diff --git a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/ParseTest.java b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/ParseTest.java
index d94bfb7df..be4b9f774 100644
--- a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/ParseTest.java
+++ b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/ParseTest.java
@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.security.Security;
 
 import junit.framework.TestCase;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
@@ -239,6 +240,11 @@ public class ParseTest
       + "C0uiH9G2IB5QRyu6RsCUgrkeMTMBqlIBlnDBy+EgLouDU4Dehxy5uzEl5DBKZEewZpQZOTO/kAgL"
       + "WruAAg/Lj4r0f9vN12wRlHoS2UKDjrE1DnUBbrM=");
 
+    public void setUp()
+    {
+        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+    }
+
     /* (non-Javadoc)
      * @see org.bouncycastle.util.test.Test#getName()
      */
diff --git a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTest.java b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTest.java
index f0d635d56..a59a4b008 100644
--- a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTest.java
+++ b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTest.java
@@ -6,6 +6,7 @@ import java.security.PrivateKey;
 import java.security.cert.CertStore;
 import java.security.cert.CollectionCertStoreParameters;
 import java.security.cert.X509Certificate;
+import java.security.Security;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -34,6 +35,7 @@ public class TSPTest
     public void testGeneral()
         throws Exception
     {
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
             String signDN = "O=Bouncy Castle, C=AU";
             KeyPair signKP = TSPTestUtil.makeKeyPair();
             X509Certificate signCert = TSPTestUtil.makeCACertificate(signKP,
diff --git a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
index fe228a1b9..d5713751d 100644
--- a/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
+++ b/bcpkix-jdk15on/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java
@@ -2,12 +2,7 @@ package org.bouncycastle.tsp.test;
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
+import java.security.*;
 import java.security.cert.X509Certificate;
 import java.util.Date;
 
@@ -57,6 +52,7 @@ public class TSPTestUtil
     {
         try
         {
+            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
             rand = new SecureRandom();
 
             kpg = KeyPairGenerator.getInstance("RSA", "BC");