Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/quite/humla-spongycastle.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'prov/src/test/jdk1.4')
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/DHTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/DHTest.java)58
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ECIESTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ECIESTest.java)36
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ImplicitlyCaTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java)48
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/NamedCurveTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/NamedCurveTest.java)28
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PKCS12StoreTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java)26
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PSSTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PSSTest.java)28
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/RSATest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RSATest.java)34
-rw-r--r--prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/RegressionTest.java (renamed from prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RegressionTest.java)12
8 files changed, 135 insertions, 135 deletions
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/DHTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/DHTest.java
index 19c30d6c..3112e9f3 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/DHTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/DHTest.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;
@@ -21,15 +21,15 @@ import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-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.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+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 DHTest
implements Test
@@ -57,7 +57,7 @@ public class DHTest
try
{
- KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "BC");
+ KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "SC");
keyGen.initialize(dhParams);
@@ -66,7 +66,7 @@ public class DHTest
//
KeyPair aKeyPair = keyGen.generateKeyPair();
- KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "BC");
+ KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "SC");
aKeyAgree.init(aKeyPair.getPrivate());
@@ -75,7 +75,7 @@ public class DHTest
//
KeyPair bKeyPair = keyGen.generateKeyPair();
- KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "BC");
+ KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "SC");
bKeyAgree.init(bKeyPair.getPrivate());
@@ -97,7 +97,7 @@ public class DHTest
// public key encoding test
//
byte[] pubEnc = aKeyPair.getPublic().getEncoded();
- KeyFactory keyFac = KeyFactory.getInstance("DH", "BC");
+ KeyFactory keyFac = KeyFactory.getInstance("DH", "SC");
X509EncodedKeySpec pubX509 = new X509EncodedKeySpec(pubEnc);
DHPublicKey pubKey = (DHPublicKey)keyFac.generatePublic(pubX509);
DHParameterSpec spec = pubKey.getParams();
@@ -182,15 +182,15 @@ public class DHTest
//
// three party test
//
- KeyPairGenerator aPairGen = KeyPairGenerator.getInstance("DH", "BC");
+ KeyPairGenerator aPairGen = KeyPairGenerator.getInstance("DH", "SC");
aPairGen.initialize(spec);
KeyPair aPair = aPairGen.generateKeyPair();
- KeyPairGenerator bPairGen = KeyPairGenerator.getInstance("DH", "BC");
+ KeyPairGenerator bPairGen = KeyPairGenerator.getInstance("DH", "SC");
bPairGen.initialize(spec);
KeyPair bPair = bPairGen.generateKeyPair();
- KeyPairGenerator cPairGen = KeyPairGenerator.getInstance("DH", "BC");
+ KeyPairGenerator cPairGen = KeyPairGenerator.getInstance("DH", "SC");
cPairGen.initialize(spec);
KeyPair cPair = cPairGen.generateKeyPair();
@@ -198,7 +198,7 @@ public class DHTest
bKeyAgree.init(bPair.getPrivate());
- KeyAgreement cKeyAgree = KeyAgreement.getInstance("DH", "BC");
+ KeyAgreement cKeyAgree = KeyAgreement.getInstance("DH", "SC");
cKeyAgree.init(cPair.getPrivate());
Key ac = aKeyAgree.doPhase(cPair.getPublic(), false);
@@ -240,13 +240,13 @@ public class DHTest
{
try
{
- AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("DH", "BC");
+ AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("DH", "SC");
a.init(size, new SecureRandom());
AlgorithmParameters params = a.generateParameters();
byte[] encodeParams = params.getEncoded();
- AlgorithmParameters a2 = AlgorithmParameters.getInstance("DH", "BC");
+ AlgorithmParameters a2 = AlgorithmParameters.getInstance("DH", "SC");
a2.init(encodeParams);
// a and a2 should be equivalent!
@@ -271,7 +271,7 @@ public class DHTest
{
try
{
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "SC");
ECCurve curve = new ECCurve.Fp(
new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
@@ -290,7 +290,7 @@ public class DHTest
//
KeyPair aKeyPair = g.generateKeyPair();
- KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDH", "BC");
+ KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDH", "SC");
aKeyAgree.init(aKeyPair.getPrivate());
@@ -299,7 +299,7 @@ public class DHTest
//
KeyPair bKeyPair = g.generateKeyPair();
- KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDH", "BC");
+ KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDH", "SC");
bKeyAgree.init(bKeyPair.getPrivate());
@@ -321,7 +321,7 @@ public class DHTest
// public key encoding test
//
byte[] pubEnc = aKeyPair.getPublic().getEncoded();
- KeyFactory keyFac = KeyFactory.getInstance("ECDH", "BC");
+ KeyFactory keyFac = KeyFactory.getInstance("ECDH", "SC");
X509EncodedKeySpec pubX509 = new X509EncodedKeySpec(pubEnc);
ECPublicKey pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
@@ -364,7 +364,7 @@ public class DHTest
{
try
{
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "SC");
ECCurve curve = new ECCurve.Fp(
new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
@@ -383,7 +383,7 @@ public class DHTest
//
KeyPair aKeyPair = g.generateKeyPair();
- KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
+ KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDHC", "SC");
aKeyAgree.init(aKeyPair.getPrivate());
@@ -392,7 +392,7 @@ public class DHTest
//
KeyPair bKeyPair = g.generateKeyPair();
- KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
+ KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDHC", "SC");
bKeyAgree.init(bKeyPair.getPrivate());
@@ -414,7 +414,7 @@ public class DHTest
// public key encoding test
//
byte[] pubEnc = aKeyPair.getPublic().getEncoded();
- KeyFactory keyFac = KeyFactory.getInstance("ECDH", "BC");
+ KeyFactory keyFac = KeyFactory.getInstance("ECDH", "SC");
X509EncodedKeySpec pubX509 = new X509EncodedKeySpec(pubEnc);
ECPublicKey pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
@@ -459,7 +459,7 @@ public class DHTest
try
{
- KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "BC");
+ KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "SC");
aKeyAgree.generateSecret("DES");
}
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ECIESTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ECIESTest.java
index 0cf97031..25af8f54 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ECIESTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ECIESTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.math.BigInteger;
import java.security.AlgorithmParameters;
@@ -11,15 +11,15 @@ import java.security.Security;
import javax.crypto.Cipher;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.IEKeySpec;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-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.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.IEKeySpec;
+import org.spongycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* test for ECIES - Elliptic Curve Integrated Encryption Scheme
@@ -62,7 +62,7 @@ public class ECIESTest
try
{
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECIES", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECIES", "SC");
ECCurve curve = new ECCurve.Fp(
new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
@@ -82,7 +82,7 @@ public class ECIESTest
return res;
}
- g = KeyPairGenerator.getInstance("ECIES", "BC");
+ g = KeyPairGenerator.getInstance("ECIES", "SC");
g.initialize(192, new SecureRandom());
@@ -92,7 +92,7 @@ public class ECIESTest
return res;
}
- g = KeyPairGenerator.getInstance("ECIES", "BC");
+ g = KeyPairGenerator.getInstance("ECIES", "SC");
g.initialize(239, new SecureRandom());
@@ -102,7 +102,7 @@ public class ECIESTest
return res;
}
- g = KeyPairGenerator.getInstance("ECIES", "BC");
+ g = KeyPairGenerator.getInstance("ECIES", "SC");
g.initialize(256, new SecureRandom());
@@ -148,8 +148,8 @@ public class ECIESTest
//
// stream test
//
- Cipher c1 = Cipher.getInstance("ECIES", "BC");
- Cipher c2 = Cipher.getInstance("ECIES", "BC");
+ Cipher c1 = Cipher.getInstance("ECIES", "SC");
+ Cipher c2 = Cipher.getInstance("ECIES", "SC");
IEKeySpec c1Key = new IEKeySpec(aPriv, bPub);
IEKeySpec c2Key = new IEKeySpec(bPriv, aPub);
@@ -204,8 +204,8 @@ public class ECIESTest
//
// stream test
//
- Cipher c1 = Cipher.getInstance("ECIES", "BC");
- Cipher c2 = Cipher.getInstance("ECIES", "BC");
+ Cipher c1 = Cipher.getInstance("ECIES", "SC");
+ Cipher c2 = Cipher.getInstance("ECIES", "SC");
IEKeySpec c1Key = new IEKeySpec(aPriv, bPub);
IEKeySpec c2Key = new IEKeySpec(bPriv, aPub);
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ImplicitlyCaTest.java
index da5affce..8ecfeb43 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/ImplicitlyCaTest.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;
@@ -10,21 +10,21 @@ import java.security.Signature;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-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.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+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.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
public class ImplicitlyCaTest
extends SimpleTest
@@ -38,7 +38,7 @@ public class ImplicitlyCaTest
throws Exception
{
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "SC");
ECCurve curve = new ECCurve.Fp(
new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
@@ -50,7 +50,7 @@ public class ImplicitlyCaTest
curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
- ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
+ ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("SC");
config.setParameter(ConfigurableProvider.EC_IMPLICITLY_CA, ecSpec);
@@ -73,7 +73,7 @@ public class ImplicitlyCaTest
private void testKeyFactory()
throws Exception
{
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "SC");
ECCurve curve = new ECCurve.Fp(
new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
@@ -85,7 +85,7 @@ public class ImplicitlyCaTest
curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
- ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
+ ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("SC");
config.setParameter(ConfigurableProvider.EC_IMPLICITLY_CA, ecSpec);
@@ -96,7 +96,7 @@ public class ImplicitlyCaTest
ECPrivateKey sKey = (ECPrivateKey)p.getPrivate();
ECPublicKey vKey = (ECPublicKey)p.getPublic();
- KeyFactory fact = KeyFactory.getInstance("ECDSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("ECDSA", "SC");
vKey = (ECPublicKey)fact.generatePublic(new ECPublicKeySpec(vKey.getQ(), null));
sKey = (ECPrivateKey)fact.generatePrivate(new ECPrivateKeySpec(sKey.getD(), null));
@@ -127,7 +127,7 @@ public class ImplicitlyCaTest
throws Exception
{
byte[] data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
- Signature s = Signature.getInstance("ECDSA", "BC");
+ Signature s = Signature.getInstance("ECDSA", "SC");
s.initSign(sKey);
@@ -135,7 +135,7 @@ public class ImplicitlyCaTest
byte[] sigBytes = s.sign();
- s = Signature.getInstance("ECDSA", "BC");
+ s = Signature.getInstance("ECDSA", "SC");
s.initVerify(vKey);
@@ -152,7 +152,7 @@ public class ImplicitlyCaTest
ECPublicKey pubKey)
throws Exception
{
- KeyFactory kFact = KeyFactory.getInstance("ECDSA", "BC");
+ KeyFactory kFact = KeyFactory.getInstance("ECDSA", "SC");
byte[] bytes = privKey.getEncoded();
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/NamedCurveTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/NamedCurveTest.java
index 33f6f0c1..9cb7ca1a 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/NamedCurveTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/NamedCurveTest.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,15 +11,15 @@ import java.security.spec.X509EncodedKeySpec;
import javax.crypto.KeyAgreement;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.jce.ECNamedCurveTable;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class NamedCurveTest
implements Test
@@ -48,7 +48,7 @@ public class NamedCurveTest
return new SimpleTestResult(false, getName() + " no curve for " + name + " found.");
}
- KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "BC");
+ KeyPairGenerator g = KeyPairGenerator.getInstance("ECDH", "SC");
g.initialize(ecSpec, new SecureRandom());
@@ -57,7 +57,7 @@ public class NamedCurveTest
//
KeyPair aKeyPair = g.generateKeyPair();
- KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
+ KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDHC", "SC");
aKeyAgree.init(aKeyPair.getPrivate());
@@ -66,7 +66,7 @@ public class NamedCurveTest
//
KeyPair bKeyPair = g.generateKeyPair();
- KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
+ KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDHC", "SC");
bKeyAgree.init(bKeyPair.getPrivate());
@@ -88,7 +88,7 @@ public class NamedCurveTest
// public key encoding test
//
byte[] pubEnc = aKeyPair.getPublic().getEncoded();
- KeyFactory keyFac = KeyFactory.getInstance("ECDH", "BC");
+ KeyFactory keyFac = KeyFactory.getInstance("ECDH", "SC");
X509EncodedKeySpec pubX509 = new X509EncodedKeySpec(pubEnc);
ECPublicKey pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PKCS12StoreTest.java
index 5ea17b6a..0dac6cf1 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PKCS12StoreTest.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;
@@ -17,11 +17,11 @@ import java.util.Date;
import java.util.Enumeration;
import java.util.Hashtable;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.x509.X509V3CertificateGenerator;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
/**
* Exercise the various key stores, making sure we at least get back what we put in!
@@ -452,7 +452,7 @@ public class PKCS12StoreTest
throws Exception
{
BigInteger mod = new BigInteger("bb1be8074e4787a8d77967f1575ef72dd7582f9b3347724413c021beafad8f32dba5168e280cbf284df722283dad2fd4abc750e3d6487c2942064e2d8d80641aa5866d1f6f1f83eec26b9b46fecb3b1c9856a303148a5cc899c642fb16f3d9d72f52526c751dc81622c420c82e2cfda70fe8d13f16cc7d6a613a5b2a2b5894d1", 16);
- KeyStore store = KeyStore.getInstance("PKCS12", "BC");
+ KeyStore store = KeyStore.getInstance("PKCS12", "SC");
ByteArrayInputStream stream = new ByteArrayInputStream(pkcs12);
store.load(stream, passwd);
@@ -536,7 +536,7 @@ public class PKCS12StoreTest
//
// UTF 8 single cert test
//
- store = KeyStore.getInstance("PKCS12", "BC");
+ store = KeyStore.getInstance("PKCS12", "SC");
stream = new ByteArrayInputStream(certUTF);
store.load(stream, "user".toCharArray());
@@ -571,7 +571,7 @@ public class PKCS12StoreTest
try
{
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
privKey = fact.generatePrivate(privKeySpec);
pubKey = fact.generatePublic(pubKeySpec);
@@ -585,7 +585,7 @@ public class PKCS12StoreTest
chain[0] = createCert(pubKey, privKey);
- store = KeyStore.getInstance("PKCS12", "BC");
+ store = KeyStore.getInstance("PKCS12", "SC");
store.load(null, null);
@@ -616,7 +616,7 @@ public class PKCS12StoreTest
//
// no friendly name test
//
- store = KeyStore.getInstance("PKCS12", "BC");
+ store = KeyStore.getInstance("PKCS12", "SC");
stream = new ByteArrayInputStream(pkcs12noFriendly);
store.load(stream, noFriendlyPassword);
@@ -656,7 +656,7 @@ public class PKCS12StoreTest
//
// storage test
//
- store = KeyStore.getInstance("PKCS12", "BC");
+ store = KeyStore.getInstance("PKCS12", "SC");
stream = new ByteArrayInputStream(pkcs12StorageIssue);
store.load(stream, storagePassword);
@@ -710,7 +710,7 @@ public class PKCS12StoreTest
//
// test of reading incorrect zero-length encoding
//
- store = KeyStore.getInstance("PKCS12", "BC");
+ store = KeyStore.getInstance("PKCS12", "SC");
stream = new ByteArrayInputStream(pkcs12nopass);
store.load(stream, "".toCharArray());
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PSSTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PSSTest.java
index 3cba08eb..6eb2bf8c 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/PSSTest.java
+++ b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/PSSTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.math.BigInteger;
import java.security.AlgorithmParameters;
@@ -14,11 +14,11 @@ import java.security.spec.PSSParameterSpec;
import java.security.spec.RSAPrivateCrtKeySpec;
import java.security.spec.RSAPublicKeySpec;
-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 PSSTest
implements Test
@@ -92,12 +92,12 @@ public class PSSTest
{
try
{
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
PrivateKey privKey = fact.generatePrivate(privKeySpec);
PublicKey pubKey = fact.generatePublic(pubKeySpec);
- Signature s = Signature.getInstance("SHA1withRSA/PSS", "BC");
+ Signature s = Signature.getInstance("SHA1withRSA/PSS", "SC");
s.initSign(privKey, new FixedRandom(slt1a));
s.update(msg1a);
@@ -108,7 +108,7 @@ public class PSSTest
return new SimpleTestResult(false, "PSS Sign test expected " + new String(Hex.encode(sig1a)) + " got " + new String(Hex.encode(sig)));
}
- s = Signature.getInstance("SHA1withRSAandMGF1", "BC");
+ s = Signature.getInstance("SHA1withRSAandMGF1", "SC");
s.initVerify(pubKey);
s.update(msg1a);
@@ -117,7 +117,7 @@ public class PSSTest
return new SimpleTestResult(false, "SHA1 signature verification failed");
}
- s = Signature.getInstance("SHA1withRSAandMGF1", "BC");
+ s = Signature.getInstance("SHA1withRSAandMGF1", "SC");
s.setParameter(new PSSParameterSpec(20));
@@ -134,7 +134,7 @@ public class PSSTest
return new SimpleTestResult(false, "failed default encoding test.");
}
- s = Signature.getInstance("SHA256withRSA/PSS", "BC");
+ s = Signature.getInstance("SHA256withRSA/PSS", "SC");
s.initSign(privKey, new FixedRandom(slt1a));
s.update(msg1a);
@@ -147,7 +147,7 @@ public class PSSTest
return new SimpleTestResult(false, "PSS Sign test expected " + new String(Hex.encode(sig1b)) + " got " + new String(Hex.encode(sig)));
}
- s = Signature.getInstance("SHA256withRSAandMGF1", "BC");
+ s = Signature.getInstance("SHA256withRSAandMGF1", "SC");
s.setParameter(pss.getParameterSpec(PSSParameterSpec.class));
@@ -161,7 +161,7 @@ public class PSSTest
//
// 512 test -with zero salt length
//
- s = Signature.getInstance("SHA512withRSAandMGF1", "BC");
+ s = Signature.getInstance("SHA512withRSAandMGF1", "SC");
s.setParameter(new PSSParameterSpec(0));
s.initSign(privKey);
@@ -176,7 +176,7 @@ public class PSSTest
return new SimpleTestResult(false, "PSS Sign test expected " + new String(Hex.encode(sig1c)) + " got " + new String(Hex.encode(sig)));
}
- s = Signature.getInstance("SHA512withRSAandMGF1", "BC");
+ s = Signature.getInstance("SHA512withRSAandMGF1", "SC");
s.setParameter(pss.getParameterSpec(PSSParameterSpec.class));
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RSATest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/RSATest.java
index d268708e..7b484d60 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RSATest.java
+++ b/prov/src/test/jdk1.4/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;
@@ -16,9 +16,9 @@ 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.SimpleTest;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class RSATest
extends SimpleTest
@@ -109,7 +109,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);
@@ -120,7 +120,7 @@ public class RSATest
//
// No Padding
//
- Cipher c = Cipher.getInstance("RSA", "BC");
+ Cipher c = Cipher.getInstance("RSA", "SC");
c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
@@ -143,7 +143,7 @@ public class RSATest
//
// No Padding - incremental
//
- c = Cipher.getInstance("RSA", "BC");
+ c = Cipher.getInstance("RSA", "SC");
c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
@@ -168,7 +168,7 @@ public class RSATest
//
// No Padding - maximum length
//
- c = Cipher.getInstance("RSA", "BC");
+ c = Cipher.getInstance("RSA", "SC");
byte[] modBytes = ((RSAPublicKey)pubKey).getModulus().toByteArray();
byte[] maxInput = new byte[modBytes.length - 1];
@@ -191,7 +191,7 @@ public class RSATest
//
// PKCS1 V 1.5
//
- c = Cipher.getInstance("RSA/ECB/PKCS1Padding", "BC");
+ c = Cipher.getInstance("RSA/ECB/PKCS1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
@@ -214,7 +214,7 @@ public class RSATest
//
// OAEP - SHA1
//
- c = Cipher.getInstance("RSA/NONE/OAEPPadding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPPadding", "SC");
c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
@@ -225,7 +225,7 @@ public class RSATest
fail("OAEP test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
}
- c = Cipher.getInstance("RSA/NONE/OAEPWithSHA1AndMGF1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPWithSHA1AndMGF1Padding", "SC");
c.init(Cipher.DECRYPT_MODE, privKey);
@@ -239,7 +239,7 @@ public class RSATest
//
// OAEP - SHA224
//
- c = Cipher.getInstance("RSA/NONE/OAEPWithSHA224AndMGF1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPWithSHA224AndMGF1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
@@ -262,7 +262,7 @@ public class RSATest
//
// OAEP - SHA 256
//
- c = Cipher.getInstance("RSA/NONE/OAEPWithSHA256AndMGF1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPWithSHA256AndMGF1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
@@ -285,7 +285,7 @@ public class RSATest
//
// OAEP - SHA 384
//
- c = Cipher.getInstance("RSA/NONE/OAEPWithSHA384AndMGF1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPWithSHA384AndMGF1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
@@ -308,7 +308,7 @@ public class RSATest
//
// OAEP - MD5
//
- c = Cipher.getInstance("RSA/NONE/OAEPWithMD5AndMGF1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/OAEPWithMD5AndMGF1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
@@ -335,7 +335,7 @@ public class RSATest
PrivateKey isoPrivKey = fact.generatePrivate(isoPrivKeySpec);
PublicKey isoPubKey = fact.generatePublic(isoPubKeySpec);
- c = Cipher.getInstance("RSA/NONE/ISO9796-1Padding", "BC");
+ c = Cipher.getInstance("RSA/NONE/ISO9796-1Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, isoPrivKey);
@@ -360,7 +360,7 @@ public class RSATest
// generation with parameters test.
//
KeyPairGenerator keyPairGen =
- KeyPairGenerator.getInstance("RSA", "BC");
+ KeyPairGenerator.getInstance("RSA", "SC");
//
// 768 bit RSA with e = 2^16-1
diff --git a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RegressionTest.java b/prov/src/test/jdk1.4/org/spongycastle/jce/provider/test/RegressionTest.java
index 5781be7e..b4e3209f 100644
--- a/prov/src/test/jdk1.4/org/bouncycastle/jce/provider/test/RegressionTest.java
+++ b/prov/src/test/jdk1.4/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
{
@@ -55,7 +55,7 @@ public class RegressionTest
{
Security.addProvider(new BouncyCastleProvider());
- System.out.println("Testing " + Security.getProvider("BC").getInfo() + " version: " + Security.getProvider("BC").getVersion());
+ System.out.println("Testing " + Security.getProvider("SC").getInfo() + " version: " + Security.getProvider("SC").getVersion());
for (int i = 0; i != tests.length; i++)
{