diff options
Diffstat (limited to 'prov/src/test/jdk1.1')
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/BlockCipherTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/BlockCipherTest.java) | 38 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathBuilderTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java) | 16 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathTest.java) | 14 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathValidatorTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java) | 16 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertStoreTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertStoreTest.java) | 14 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertTest.java) | 72 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/KeyStoreTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/KeyStoreTest.java) | 22 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/MultiCertStoreTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java) | 16 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/NetscapeCertRequestTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java) | 26 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/PKCS10CertRequestTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java) | 24 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RSATest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RSATest.java) | 20 | ||||
-rw-r--r-- | prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RegressionTest.java (renamed from prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RegressionTest.java) | 10 |
12 files changed, 144 insertions, 144 deletions
diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/BlockCipherTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/BlockCipherTest.java index 2f8d2b18..9d7e8fd9 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/BlockCipherTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/BlockCipherTest.java @@ -1,8 +1,8 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; import javax.crypto.Cipher; import javax.crypto.CipherInputStream; @@ -358,7 +358,7 @@ public class BlockCipherTest return; } - keyGen = KeyGenerator.getInstance(baseAlgorithm, "BC"); + keyGen = KeyGenerator.getInstance(baseAlgorithm, "SC"); if (!keyGen.getAlgorithm().equals(baseAlgorithm)) { fail("wrong key generator returned!"); @@ -367,8 +367,8 @@ public class BlockCipherTest key = keyGen.generateKey(); - in = Cipher.getInstance(algorithm, "BC"); - out = Cipher.getInstance(algorithm, "BC"); + in = Cipher.getInstance(algorithm, "SC"); + out = Cipher.getInstance(algorithm, "SC"); if (!in.getAlgorithm().startsWith(baseAlgorithm)) { @@ -520,7 +520,7 @@ public class BlockCipherTest { try { - Cipher.getInstance("IDEA", "BC"); + Cipher.getInstance("IDEA", "SC"); return false; } @@ -536,7 +536,7 @@ public class BlockCipherTest try { - skF = SecretKeyFactory.getInstance("DESede", "BC"); + skF = SecretKeyFactory.getInstance("DESede", "SC"); } catch (Exception e) { @@ -591,7 +591,7 @@ public class BlockCipherTest try { - KeyGenerator kg = KeyGenerator.getInstance("DESede", "BC"); + KeyGenerator kg = KeyGenerator.getInstance("DESede", "SC"); try { kg.init(Integer.MIN_VALUE, new SecureRandom()); @@ -614,7 +614,7 @@ public class BlockCipherTest try { - skF = SecretKeyFactory.getInstance("DESede", "BC"); + skF = SecretKeyFactory.getInstance("DESede", "SC"); try { @@ -643,7 +643,7 @@ public class BlockCipherTest SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES"); - Cipher cipher = Cipher.getInstance("DES/CBC/NoPadding", "BC"); + Cipher cipher = Cipher.getInstance("DES/CBC/NoPadding", "SC"); try { @@ -671,7 +671,7 @@ public class BlockCipherTest byte[] rawDESKey = { -128, -125, -123, -122, -119, -118 }; SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES"); - Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "BC"); + Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "SC"); try { // According specification engineInit(int opmode, Key key, @@ -696,7 +696,7 @@ public class BlockCipherTest byte[] rawDESKey = { -128, -125, -123, -122, -119, -118, -117, -115, -114 }; SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES"); - Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "BC"); + Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "SC"); try { // According specification engineInit(int opmode, Key key, @@ -723,7 +723,7 @@ public class BlockCipherTest (byte)137, (byte)138, (byte)140, (byte)143 }; SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES"); - Cipher ecipher = Cipher.getInstance("DES/ECB/PKCS5Padding", "BC"); + Cipher ecipher = Cipher.getInstance("DES/ECB/PKCS5Padding", "SC"); ecipher.init(Cipher.ENCRYPT_MODE, cipherKey); byte[] cipherText = new byte[0]; @@ -751,7 +751,7 @@ public class BlockCipherTest try { - KeyGenerator keyGen = KeyGenerator.getInstance("DES", "BC"); + KeyGenerator keyGen = KeyGenerator.getInstance("DES", "SC"); keyGen.init((SecureRandom)null); @@ -772,7 +772,7 @@ public class BlockCipherTest { try { - Cipher c = Cipher.getInstance("DES", "BC"); + Cipher c = Cipher.getInstance("DES", "SC"); Key k = new PublicKey() { @@ -805,7 +805,7 @@ public class BlockCipherTest try { - Cipher c = Cipher.getInstance("DES", "BC"); + Cipher c = Cipher.getInstance("DES", "SC"); Key k = new PrivateKey() { @@ -859,7 +859,7 @@ public class BlockCipherTest // try { - Cipher c = Cipher.getInstance("AES/CTS/NoPadding", "BC"); + Cipher c = Cipher.getInstance("AES/CTS/NoPadding", "SC"); c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[16], "AES")); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathBuilderTest.java index 216b017d..46354285 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathBuilderTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.security.Security; @@ -9,11 +9,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class CertPathBuilderTest implements Test @@ -23,7 +23,7 @@ public class CertPathBuilderTest { try { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); // initialise CertStore X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.rootCertBin)); @@ -46,7 +46,7 @@ public class CertPathBuilderTest Set trust = new HashSet(); trust.add( new TrustAnchor( rootCert, null ) ); - CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","BC"); + CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","SC"); X509CertSelector targetConstraints = new X509CertSelector(); targetConstraints.setSubject(((X509Principal)rootCert.getSubjectDN()).getEncoded()); PKIXBuilderParameters params = new PKIXBuilderParameters( trust, targetConstraints ); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathTest.java index e406ff83..dacdb96e 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.security.Security; @@ -8,11 +8,11 @@ import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class CertPathTest implements Test @@ -32,7 +32,7 @@ public class CertPathTest { try { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin)); X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(interCertBin)); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathValidatorTest.java index 336f6a0d..f4607bc0 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertPathValidatorTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.security.PublicKey; @@ -10,10 +10,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class CertPathValidatorTest implements Test @@ -23,7 +23,7 @@ public class CertPathValidatorTest { try { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); // initialise CertStore X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.rootCertBin)); @@ -46,11 +46,11 @@ public class CertPathValidatorTest List certchain = new ArrayList(); certchain.add( finalCert ); certchain.add( interCert ); - CertPath cp = CertificateFactory.getInstance("X.509","BC").generateCertPath( certchain ); + CertPath cp = CertificateFactory.getInstance("X.509","SC").generateCertPath( certchain ); Set trust = new HashSet(); trust.add( new TrustAnchor( rootCert, null ) ); - CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC"); + CertPathValidator cpv = CertPathValidator.getInstance("PKIX","SC"); PKIXParameters param = new PKIXParameters( trust ); param.addCertStore(store); param.setDate( validDate.getTime() ); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertStoreTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertStoreTest.java index 9e56ed74..b221a268 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertStoreTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertStoreTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.security.Security; @@ -13,11 +13,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class CertStoreTest implements Test @@ -27,7 +27,7 @@ public class CertStoreTest { try { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.rootCertBin)); X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.interCertBin)); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertTest.java index 6f5b2bb7..7e3ba60b 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/CertTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/CertTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -20,26 +20,26 @@ import java.util.Hashtable; import java.util.Set; import java.util.Vector; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.jce.X509KeyUsage; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.interfaces.ECPointEncoder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ECParameterSpec; -import org.bouncycastle.jce.spec.ECPrivateKeySpec; -import org.bouncycastle.jce.spec.ECPublicKeySpec; -import org.bouncycastle.math.ec.ECCurve; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; -import org.bouncycastle.x509.X509V1CertificateGenerator; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.KeyPurposeId; +import org.spongycastle.jce.X509KeyUsage; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.interfaces.ECPointEncoder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ECParameterSpec; +import org.spongycastle.jce.spec.ECPrivateKeySpec; +import org.spongycastle.jce.spec.ECPublicKeySpec; +import org.spongycastle.math.ec.ECCurve; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; +import org.spongycastle.x509.X509V1CertificateGenerator; +import org.spongycastle.x509.X509V3CertificateGenerator; public class CertTest implements Test @@ -485,7 +485,7 @@ public class CertTest { bIn = new ByteArrayInputStream(bytes); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); Certificate cert = fact.generateCertificate(bIn); @@ -511,7 +511,7 @@ public class CertTest { bIn = new ByteArrayInputStream(bytes); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn); @@ -541,7 +541,7 @@ public class CertTest { bIn = new ByteArrayInputStream(bytes); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn); @@ -574,7 +574,7 @@ public class CertTest { bIn = new ByteArrayInputStream(bytes); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); Certificate cert = fact.generateCertificate(bIn); @@ -622,7 +622,7 @@ public class CertTest try { - KeyFactory fact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory fact = KeyFactory.getInstance("RSA", "SC"); privKey = fact.generatePrivate(privKeySpec); pubKey = fact.generatePublic(pubKeySpec); @@ -721,7 +721,7 @@ public class CertTest ByteArrayInputStream sbIn = new ByteArrayInputStream(cert.getEncoded()); ASN1InputStream sdIn = new ASN1InputStream(sbIn); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -759,7 +759,7 @@ public class CertTest cert.verify(pubKey); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -841,7 +841,7 @@ public class CertTest cert.verify(pubKey); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -874,7 +874,7 @@ public class CertTest cert.verify(pubKey); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -920,7 +920,7 @@ public class CertTest try { - KeyFactory fact = KeyFactory.getInstance("ECDSA", "BC"); + KeyFactory fact = KeyFactory.getInstance("ECDSA", "SC"); privKey = fact.generatePrivate(privKeySpec); pubKey = fact.generatePublic(pubKeySpec); @@ -993,7 +993,7 @@ public class CertTest cert.verify(pubKey); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -1011,7 +1011,7 @@ public class CertTest cert.verify(pubKey); bIn = new ByteArrayInputStream(cert.getEncoded()); - fact = CertificateFactory.getInstance("X.509", "BC"); + fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); // System.out.println(cert); @@ -1049,7 +1049,7 @@ public class CertTest { bIn = new ByteArrayInputStream(bytes); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); CRL cert = fact.generateCRL(bIn); @@ -1076,7 +1076,7 @@ public class CertTest // // try // { -// KeyPairGenerator g = KeyPairGenerator.getInstance("GOST3410", "BC"); +// KeyPairGenerator g = KeyPairGenerator.getInstance("GOST3410", "SC"); // GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec("GostR3410-94-CryptoPro-A"); // // g.initialize(gost3410P, new SecureRandom()); @@ -1136,7 +1136,7 @@ public class CertTest // cert.verify(cert.getPublicKey()); // // ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); -// CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); +// CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); // // cert = (X509Certificate)fact.generateCertificate(bIn); // diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/KeyStoreTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/KeyStoreTest.java index 0f25ffa4..0560ffdc 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/KeyStoreTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/KeyStoreTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,12 +16,12 @@ import java.security.interfaces.RSAPublicKey; import java.util.Date; import java.util.Hashtable; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; +import org.spongycastle.x509.X509V3CertificateGenerator; /** * Exercise the various key stores, making sure we at least get back what we put in! @@ -38,11 +38,11 @@ public class KeyStoreTest { try { - KeyStore store = KeyStore.getInstance(storeName, "BC"); + KeyStore store = KeyStore.getInstance(storeName, "SC"); store.load(null, null); - KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "SC"); gen.initialize(1024, new SecureRandom()); @@ -92,7 +92,7 @@ public class KeyStoreTest cert.verify(pubKey); ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded()); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)fact.generateCertificate(bIn); @@ -117,7 +117,7 @@ public class KeyStoreTest // // start with a new key store // - store = KeyStore.getInstance(storeName, "BC"); + store = KeyStore.getInstance(storeName, "SC"); store.load(bIn, passwd); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/MultiCertStoreTest.java index c52e8e2a..1e12e309 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/MultiCertStoreTest.java @@ -1,9 +1,9 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; -import org.bouncycastle.jce.PrincipalUtil; -import org.bouncycastle.jce.MultiCertStoreParameters; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.jce.PrincipalUtil; +import org.spongycastle.jce.MultiCertStoreParameters; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTest; import java.io.ByteArrayInputStream; import java.security.Security; @@ -30,7 +30,7 @@ public class MultiCertStoreTest private void basicTest() throws Exception { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); X509Certificate rootCert = (X509Certificate)cf .generateCertificate(new ByteArrayInputStream( @@ -55,8 +55,8 @@ public class MultiCertStoreTest list.add(rootCrl); list.add(interCrl); CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list); - CertStore store1 = CertStore.getInstance("Collection", ccsp, "BC"); - CertStore store2 = CertStore.getInstance("Collection", ccsp, "BC"); + CertStore store1 = CertStore.getInstance("Collection", ccsp, "SC"); + CertStore store2 = CertStore.getInstance("Collection", ccsp, "SC"); List storeList = new ArrayList(); storeList.add(store1); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/NetscapeCertRequestTest.java index 5b4cfb59..5bb209b0 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/NetscapeCertRequestTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -6,17 +6,17 @@ import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Security; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DEROutputStream; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.jce.netscape.NetscapeCertRequest; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.DEROutputStream; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.jce.netscape.NetscapeCertRequest; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; /** **/ @@ -60,7 +60,7 @@ public class NetscapeCertRequestTest //now try to generate one KeyPairGenerator kpg = - KeyPairGenerator.getInstance (nscr.getKeyAlgorithm().getObjectId ().getId(), "BC"); + KeyPairGenerator.getInstance (nscr.getKeyAlgorithm().getObjectId ().getId(), "SC"); kpg.initialize (1024); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/PKCS10CertRequestTest.java index 3850b46a..bffe5b27 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/PKCS10CertRequestTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -7,16 +7,16 @@ import java.security.KeyPairGenerator; import java.security.Security; import java.util.Hashtable; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DEROutputStream; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.jce.PKCS10CertificationRequest; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.DEROutputStream; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.jce.PKCS10CertificationRequest; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; /** **/ @@ -32,7 +32,7 @@ public class PKCS10CertRequestTest { try { - KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(512); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RSATest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RSATest.java index e756f401..b1173f6a 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RSATest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RSATest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.math.BigInteger; import java.security.KeyFactory; @@ -11,11 +11,11 @@ import java.security.spec.RSAPublicKeySpec; import javax.crypto.Cipher; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class RSATest implements Test @@ -101,7 +101,7 @@ public class RSATest SecureRandom rand = new FixedSecureRandom(); - fact = KeyFactory.getInstance("RSA", "BC"); + fact = KeyFactory.getInstance("RSA", "SC"); PrivateKey privKey = fact.generatePrivate(privKeySpec); PublicKey pubKey = fact.generatePublic(pubKeySpec); @@ -109,7 +109,7 @@ public class RSATest // // No Padding // - Cipher c = Cipher.getInstance("RSA//NoPadding", "BC"); + Cipher c = Cipher.getInstance("RSA//NoPadding", "SC"); c.init(Cipher.ENCRYPT_MODE, pubKey, rand); @@ -132,7 +132,7 @@ public class RSATest // // PKCS1 V 1.5 // - c = Cipher.getInstance("RSA//PKCS1Padding", "BC"); + c = Cipher.getInstance("RSA//PKCS1Padding", "SC"); c.init(Cipher.ENCRYPT_MODE, pubKey, rand); @@ -155,7 +155,7 @@ public class RSATest // // OAEP // - c = Cipher.getInstance("RSA//OAEPPadding", "BC"); + c = Cipher.getInstance("RSA//OAEPPadding", "SC"); c.init(Cipher.ENCRYPT_MODE, pubKey, rand); diff --git a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RegressionTest.java b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RegressionTest.java index e94138dd..9b8e0bd9 100644 --- a/prov/src/test/jdk1.1/org/bouncycastle/jce/provider/test/RegressionTest.java +++ b/prov/src/test/jdk1.1/org/spongycastle/jce/provider/test/RegressionTest.java @@ -1,11 +1,11 @@ -package org.bouncycastle.jce.provider.test; +package org.spongycastle.jce.provider.test; import java.security.Security; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class RegressionTest { |