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
path: root/prov/src/test/jdk1.3/org
diff options
context:
space:
mode:
Diffstat (limited to 'prov/src/test/jdk1.3/org')
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathBuilderTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java)40
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathTest.java)20
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathValidatorTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java)38
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertStoreTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertStoreTest.java)24
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertTest.java)156
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/MultiCertStoreTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java)24
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/NISTCertPathTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/NISTCertPathTest.java)34
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PBETest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PBETest.java)60
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PKIXPolicyMappingTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java)46
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PSSTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PSSTest.java)22
-rw-r--r--prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/nist/NistCertPathTest.java (renamed from prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java)56
11 files changed, 260 insertions, 260 deletions
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathBuilderTest.java
index e46fd541..fee48f48 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathBuilderTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.io.ByteArrayInputStream;
import java.math.BigInteger;
import java.security.KeyPair;
import java.security.Security;
-import org.bouncycastle.jce.cert.CertPath;
-import org.bouncycastle.jce.cert.CertPathBuilder;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.CertificateFactory;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.PKIXBuilderParameters;
-import org.bouncycastle.jce.cert.PKIXCertPathBuilderResult;
-import org.bouncycastle.jce.cert.TrustAnchor;
+import org.spongycastle.jce.cert.CertPath;
+import org.spongycastle.jce.cert.CertPathBuilder;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.CertificateFactory;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.PKIXBuilderParameters;
+import org.spongycastle.jce.cert.PKIXCertPathBuilderResult;
+import org.spongycastle.jce.cert.TrustAnchor;
import java.security.cert.X509CRL;
-import org.bouncycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.cert.X509CertSelector;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Calendar;
@@ -23,11 +23,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.bouncycastle.jce.PrincipalUtil;
-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.PrincipalUtil;
+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
@@ -37,7 +37,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));
@@ -52,7 +52,7 @@ public class CertPathBuilderTest
list.add(rootCrl);
list.add(interCrl);
CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
- CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
+ CertStore store = CertStore.getInstance("Collection", ccsp, "SC");
Calendar validDate = Calendar.getInstance();
validDate.set(2002,2,21,2,21,10);
@@ -60,7 +60,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(PrincipalUtil.getSubjectX509Principal(finalCert).getEncoded());
PKIXBuilderParameters params = new PKIXBuilderParameters(trust, targetConstraints);
@@ -112,7 +112,7 @@ public class CertPathBuilderTest
CertStore store = CertStore.getInstance("Collection", params);
// build the path
- CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
+ CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "SC");
X509CertSelector pathConstraints = new X509CertSelector();
pathConstraints.setSubject(PrincipalUtil.getSubjectX509Principal(endCert).getEncoded());
@@ -139,7 +139,7 @@ public class CertPathBuilderTest
}
/* (non-Javadoc)
- * @see org.bouncycastle.util.test.Test#perform()
+ * @see org.spongycastle.util.test.Test#perform()
*/
public TestResult perform()
{
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathTest.java
index 1c3654a2..28d70164 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathTest.java
+++ b/prov/src/test/jdk1.3/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.io.ByteArrayOutputStream;
@@ -20,13 +20,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import org.bouncycastle.jce.cert.CertPath;
-import org.bouncycastle.jce.cert.CertificateFactory;
-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.cert.CertPath;
+import org.spongycastle.jce.cert.CertificateFactory;
+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
@@ -66,7 +66,7 @@ public class CertPathTest
try
{
CertificateFactory cFac = CertificateFactory.getInstance("X.509",
- "BC");
+ "SC");
arr = os.toByteArray();
is = new ByteArrayInputStream(arr);
cFac.generateCertPath(is);
@@ -89,7 +89,7 @@ public class CertPathTest
try
{
CertificateFactory cf = CertificateFactory.getInstance("X.509",
- "BC");
+ "SC");
X509Certificate rootCert = (X509Certificate)cf
.generateCertificate(new ByteArrayInputStream(rootCertBin));
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathValidatorTest.java
index c6d935ff..576a4d80 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertPathValidatorTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.io.ByteArrayInputStream;
import java.security.PublicKey;
import java.security.Security;
-import org.bouncycastle.jce.cert.CertPath;
-import org.bouncycastle.jce.cert.CertPathValidator;
-import org.bouncycastle.jce.cert.CertPathValidatorException;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.CertificateFactory;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.PKIXCertPathValidatorResult;
-import org.bouncycastle.jce.cert.PKIXParameters;
-import org.bouncycastle.jce.cert.PolicyNode;
-import org.bouncycastle.jce.cert.TrustAnchor;
+import org.spongycastle.jce.cert.CertPath;
+import org.spongycastle.jce.cert.CertPathValidator;
+import org.spongycastle.jce.cert.CertPathValidatorException;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.CertificateFactory;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.PKIXCertPathValidatorResult;
+import org.spongycastle.jce.cert.PKIXParameters;
+import org.spongycastle.jce.cert.PolicyNode;
+import org.spongycastle.jce.cert.TrustAnchor;
import java.security.cert.X509CRL;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -21,9 +21,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class CertPathValidatorTest
extends SimpleTest
@@ -138,7 +138,7 @@ public class CertPathValidatorTest
public void performTest()
throws Exception
{
- 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));
@@ -161,11 +161,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());
@@ -203,11 +203,11 @@ public class CertPathValidatorTest
certchain = new ArrayList();
certchain.add(finalCert);
certchain.add(interCert);
- cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
+ cp = CertificateFactory.getInstance("X.509","SC").generateCertPath(certchain);
trust = new HashSet();
trust.add(new TrustAnchor(rootCert, null));
- cpv = CertPathValidator.getInstance("PKIX","BC");
+ cpv = CertPathValidator.getInstance("PKIX","SC");
param = new PKIXParameters(trust);
param.addCertStore(store);
param.setRevocationEnabled(false);
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertStoreTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertStoreTest.java
index f143110b..ccbbd4e4 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertStoreTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertStoreTest.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.io.ByteArrayInputStream;
import java.security.Security;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.cert.CertStore;
+import org.spongycastle.jce.PrincipalUtil;
+import org.spongycastle.jce.cert.CertStore;
import java.security.cert.CertificateFactory;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
import java.security.cert.X509CRL;
-import org.bouncycastle.jce.cert.X509CRLSelector;
-import org.bouncycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.cert.X509CRLSelector;
+import org.spongycastle.jce.cert.X509CertSelector;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-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 CertStoreTest
implements Test
@@ -29,7 +29,7 @@ public class CertStoreTest
try
{
CertificateFactory cf = CertificateFactory.getInstance("X.509",
- "BC");
+ "SC");
X509Certificate rootCert = (X509Certificate)cf
.generateCertificate(new ByteArrayInputStream(
@@ -55,7 +55,7 @@ public class CertStoreTest
list.add(interCrl);
CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(
list);
- CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
+ CertStore store = CertStore.getInstance("Collection", ccsp, "SC");
// Searching for rootCert by subjectDN
X509CertSelector targetConstraints = new X509CertSelector();
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertTest.java
index aa0c785b..51e97826 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/CertTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/CertTest.java
@@ -1,41 +1,41 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-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.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V1CertificateGenerator;
-import org.bouncycastle.x509.X509V2CRLGenerator;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+package org.spongycastle.jce.provider.test;
+
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.cms.CMSObjectIdentifiers;
+import org.spongycastle.asn1.cms.ContentInfo;
+import org.spongycastle.asn1.cms.SignedData;
+import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.spongycastle.asn1.x509.CRLReason;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.KeyPurposeId;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+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.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.x509.X509V1CertificateGenerator;
+import org.spongycastle.x509.X509V2CRLGenerator;
+import org.spongycastle.x509.X509V3CertificateGenerator;
+import org.spongycastle.x509.extension.AuthorityKeyIdentifierStructure;
+import org.spongycastle.x509.extension.X509ExtensionUtil;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -1012,7 +1012,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);
@@ -1037,7 +1037,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);
@@ -1066,7 +1066,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);
@@ -1098,7 +1098,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);
@@ -1143,7 +1143,7 @@ public class CertTest
PrivateKey privKey;
PublicKey pubKey;
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
privKey = fact.generatePrivate(privKeySpec);
pubKey = fact.generatePublic(pubKeySpec);
@@ -1236,7 +1236,7 @@ public class CertTest
ByteArrayInputStream sbIn = new ByteArrayInputStream(cert.getEncoded());
ASN1InputStream sdIn = new ASN1InputStream(sbIn);
ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded());
- CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory certFact = CertificateFactory.getInstance("X.509", "SC");
cert = (X509Certificate)certFact.generateCertificate(bIn);
@@ -1267,7 +1267,7 @@ public class CertTest
cert.verify(pubKey);
bIn = new ByteArrayInputStream(cert.getEncoded());
- certFact = CertificateFactory.getInstance("X.509", "BC");
+ certFact = CertificateFactory.getInstance("X.509", "SC");
cert = (X509Certificate)certFact.generateCertificate(bIn);
@@ -1343,7 +1343,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);
@@ -1376,7 +1376,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);
@@ -1434,7 +1434,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);
@@ -1508,7 +1508,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);
@@ -1519,14 +1519,14 @@ public class CertTest
certGen.setPublicKey(pubKey);
- cert = certGen.generate(privKey, "BC");
+ cert = certGen.generate(privKey, "SC");
cert.checkValidity(new Date());
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);
@@ -1582,7 +1582,7 @@ public class CertTest
PrivateKey privKey;
PublicKey pubKey;
- KeyFactory fact = KeyFactory.getInstance("ECDSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("ECDSA", "SC");
privKey = fact.generatePrivate(privKeySpec);
pubKey = fact.generatePublic(pubKeySpec);
@@ -1620,14 +1620,14 @@ public class CertTest
certGen.setSignatureAlgorithm(algorithm);
- X509Certificate cert = certGen.generate(privKey, "BC");
+ X509Certificate cert = certGen.generate(privKey, "SC");
cert.checkValidity(new Date());
cert.verify(pubKey);
ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded());
- CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory certFact = CertificateFactory.getInstance("X.509", "SC");
cert = (X509Certificate)certFact.generateCertificate(bIn);
@@ -1638,14 +1638,14 @@ public class CertTest
certGen.setPublicKey(pubKey);
- cert = certGen.generate(privKey, "BC");
+ cert = certGen.generate(privKey, "SC");
cert.checkValidity(new Date());
cert.verify(pubKey);
bIn = new ByteArrayInputStream(cert.getEncoded());
- certFact = CertificateFactory.getInstance("X.509", "BC");
+ certFact = CertificateFactory.getInstance("X.509", "SC");
cert = (X509Certificate)certFact.generateCertificate(bIn);
@@ -1659,7 +1659,7 @@ public class CertTest
fail("sig parameters present");
}
- Signature sig = Signature.getInstance(algorithm, "BC");
+ Signature sig = Signature.getInstance(algorithm, "SC");
sig.initVerify(pubKey);
@@ -1683,7 +1683,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);
@@ -1699,7 +1699,7 @@ public class CertTest
public void checkCRLCreation1()
throws Exception
{
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC");
X509V2CRLGenerator crlGen = new X509V2CRLGenerator();
Date now = new Date();
KeyPair pair = kpGen.generateKeyPair();
@@ -1714,7 +1714,7 @@ public class CertTest
crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
- X509CRL crl = crlGen.generate(pair.getPrivate(), "BC");
+ X509CRL crl = crlGen.generate(pair.getPrivate(), "SC");
if (!crl.getIssuerDN().equals(new X509Principal("CN=Test CA")))
{
@@ -1767,7 +1767,7 @@ public class CertTest
public void checkCRLCreation2()
throws Exception
{
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC");
X509V2CRLGenerator crlGen = new X509V2CRLGenerator();
Date now = new Date();
KeyPair pair = kpGen.generateKeyPair();
@@ -1799,7 +1799,7 @@ public class CertTest
crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
- X509CRL crl = crlGen.generate(pair.getPrivate(), "BC");
+ X509CRL crl = crlGen.generate(pair.getPrivate(), "SC");
if (!crl.getIssuerDN().equals(new X509Principal("CN=Test CA")))
{
@@ -1852,7 +1852,7 @@ public class CertTest
public void checkCRLCreation3()
throws Exception
{
- KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC");
+ KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC");
X509V2CRLGenerator crlGen = new X509V2CRLGenerator();
Date now = new Date();
KeyPair pair = kpGen.generateKeyPair();
@@ -1884,7 +1884,7 @@ public class CertTest
crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
- X509CRL crl = crlGen.generate(pair.getPrivate(), "BC");
+ X509CRL crl = crlGen.generate(pair.getPrivate(), "SC");
if (!crl.getIssuerDN().equals(new X509Principal("CN=Test CA")))
{
@@ -1951,7 +1951,7 @@ public class CertTest
crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
- X509CRL newCrl = crlGen.generate(pair.getPrivate(), "BC");
+ X509CRL newCrl = crlGen.generate(pair.getPrivate(), "SC");
int count = 0;
boolean oneFound = false;
@@ -1987,7 +1987,7 @@ public class CertTest
//
// check factory read back
//
- CertificateFactory cFact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory cFact = CertificateFactory.getInstance("X.509", "SC");
X509CRL readCrl = (X509CRL)cFact.generateCRL(new ByteArrayInputStream(newCrl.getEncoded()));
@@ -2016,7 +2016,7 @@ public class CertTest
PrivateKey privKey;
PublicKey pubKey;
- 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());
@@ -2054,7 +2054,7 @@ public class CertTest
certGen.setPublicKey(pubKey);
certGen.setSignatureAlgorithm("GOST3411withGOST3410");
- X509Certificate cert = certGen.generate(privKey, "BC");
+ X509Certificate cert = certGen.generate(privKey, "SC");
cert.checkValidity(new Date());
@@ -2069,7 +2069,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);
@@ -2106,7 +2106,7 @@ public class CertTest
PrivateKey privKey;
PublicKey pubKey;
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
privKey = fact.generatePrivate(privKeySpec);
pubKey = fact.generatePublic(pubKeySpec);
@@ -2156,7 +2156,7 @@ public class CertTest
certGen.addExtension("2.5.29.17", true,
new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
- X509Certificate baseCert = certGen.generate(privKey, "BC");
+ X509Certificate baseCert = certGen.generate(privKey, "SC");
//
// copy certificate
@@ -2174,7 +2174,7 @@ public class CertTest
certGen.copyAndAddExtension(new ASN1ObjectIdentifier("2.5.29.15"), true, baseCert);
certGen.copyAndAddExtension("2.5.29.37", false, baseCert);
- X509Certificate cert = certGen.generate(privKey, "BC");
+ X509Certificate cert = certGen.generate(privKey, "SC");
cert.checkValidity(new Date());
@@ -2208,7 +2208,7 @@ public class CertTest
{
certGen.setPublicKey(dudPublicKey);
- certGen.generate(privKey, "BC");
+ certGen.generate(privKey, "SC");
fail("key without encoding not detected in v3");
}
@@ -2232,7 +2232,7 @@ public class CertTest
+ "DF6P14yRKUtX8akOP2TwStaSiVf/akYqfLFm3UGka5XbPj4rifrZ0/sOoZEEBvHQ"
+ "e20sRA==";
- CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory certFact = CertificateFactory.getInstance("X.509", "SC");
X509Certificate x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(Base64.decode(cert)));
try
@@ -2251,7 +2251,7 @@ public class CertTest
private void pemTest()
throws Exception
{
- CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC");
Certificate cert = cf.generateCertificate(new ByteArrayInputStream(PEMData.CERTIFICATE_1.getBytes("US-ASCII")));
if (cert == null)
@@ -2290,7 +2290,7 @@ public class CertTest
ContentInfo info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
- CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC");
X509Certificate cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
if (cert == null || !areEqual(cert.getEncoded(), certs.get(0).toASN1Primitive().getEncoded()))
@@ -2382,7 +2382,7 @@ public class CertTest
new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
PrivateKey privKey = fact.generatePrivate(privKeySpec);
PublicKey pubKey = fact.generatePublic(pubKeySpec);
@@ -2432,7 +2432,7 @@ public class CertTest
certGen.addExtension("2.5.29.17", true,
new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
- X509Certificate baseCert = certGen.generate(privKey, "BC");
+ X509Certificate baseCert = certGen.generate(privKey, "SC");
baseCert.verify(pubKey);
}
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/MultiCertStoreTest.java
index 9ba68e47..f632ac42 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/MultiCertStoreTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.MultiCertStoreParameters;
-import org.bouncycastle.jce.PrincipalUtil;
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.MultiCertStoreParameters;
+import org.spongycastle.jce.PrincipalUtil;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.cert.X509CRL;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.X509CertSelector;
-import org.bouncycastle.jce.cert.X509CRLSelector;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.cert.X509CRLSelector;
import java.security.Security;
import java.io.ByteArrayInputStream;
import java.util.List;
@@ -32,7 +32,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(
@@ -57,8 +57,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.3/org/bouncycastle/jce/provider/test/NISTCertPathTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/NISTCertPathTest.java
index 1551c9f6..b1186212 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/NISTCertPathTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/NISTCertPathTest.java
@@ -1,27 +1,27 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.io.ByteArrayInputStream;
import java.security.GeneralSecurityException;
import java.security.Security;
import java.security.cert.*;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.TrustAnchor;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.PKIXBuilderParameters;
-import org.bouncycastle.jce.cert.X509CertSelector;
-import org.bouncycastle.jce.cert.CertPathBuilder;
-import org.bouncycastle.jce.cert.CertPathBuilderResult;
+import org.spongycastle.jce.PrincipalUtil;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.TrustAnchor;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.PKIXBuilderParameters;
+import org.spongycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.cert.CertPathBuilder;
+import org.spongycastle.jce.cert.CertPathBuilderResult;
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
/*
@@ -265,7 +265,7 @@ public class NISTCertPathTest
{
try
{
- fact = CertificateFactory.getInstance("X.509", "BC");
+ fact = CertificateFactory.getInstance("X.509", "SC");
trustedCert = (X509Certificate)fact
.generateCertificate(new ByteArrayInputStream(Base64
.decode(Trust_Anchor_CP_01_01_crt)));
@@ -347,7 +347,7 @@ public class NISTCertPathTest
}
return CertStore.getInstance("Collection",
- new CollectionCertStoreParameters(_vec2), "BC");
+ new CollectionCertStoreParameters(_vec2), "SC");
}
private void test(String _name, String[] _data, boolean _accept,
@@ -373,7 +373,7 @@ public class NISTCertPathTest
try
{
- CertPathBuilder _cpb = CertPathBuilder.getInstance("PKIX", "BC");
+ CertPathBuilder _cpb = CertPathBuilder.getInstance("PKIX", "SC");
X509Certificate _ee = decodeCertificate(_data[_data.length - 1]);
X509CertSelector _select = new X509CertSelector();
_select.setSubject(PrincipalUtil.getSubjectX509Principal(_ee).getEncoded());
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PBETest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PBETest.java
index 4f9ed0b2..9b806ea5 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PBETest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PBETest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.security.AlgorithmParameters;
import java.security.Security;
@@ -12,19 +12,19 @@ import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-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.crypto.Digest;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.OpenSSLPBEParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS12ParametersGenerator;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+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;
/**
* test out the various PBE modes, making sure the JCE implementations
@@ -84,23 +84,23 @@ public class PBETest implements Test
if (baseAlgorithm.equals("RC4"))
{
- c = Cipher.getInstance(baseAlgorithm, "BC");
+ c = Cipher.getInstance(baseAlgorithm, "SC");
c.init(Cipher.ENCRYPT_MODE, encKey);
}
else
{
- c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "BC");
+ c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, encKey, new IvParameterSpec(params.getIV()));
}
byte[] enc = c.doFinal(salt);
- c = Cipher.getInstance(algorithm, "BC");
+ c = Cipher.getInstance(algorithm, "SC");
PBEKeySpec keySpec = new PBEKeySpec(password);
- SecretKeyFactory fact = SecretKeyFactory.getInstance(algorithm, "BC");
+ SecretKeyFactory fact = SecretKeyFactory.getInstance(algorithm, "SC");
c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec), new PBEParameterSpec(salt, iCount));
@@ -174,23 +174,23 @@ public class PBETest implements Test
if (baseAlgorithm.equals("RC4"))
{
- c = Cipher.getInstance(baseAlgorithm, "BC");
+ c = Cipher.getInstance(baseAlgorithm, "SC");
c.init(Cipher.ENCRYPT_MODE, encKey);
}
else
{
- c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "BC");
+ c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "SC");
c.init(Cipher.ENCRYPT_MODE, encKey, new IvParameterSpec(params.getIV()));
}
byte[] enc = c.doFinal(salt);
- c = Cipher.getInstance(algorithm, "BC");
+ c = Cipher.getInstance(algorithm, "SC");
PBEKeySpec keySpec = new PBEKeySpec(password);
- SecretKeyFactory fact = SecretKeyFactory.getInstance(algorithm, "BC");
+ SecretKeyFactory fact = SecretKeyFactory.getInstance(algorithm, "SC");
c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec), new PBEParameterSpec(salt, iCount));
@@ -275,10 +275,10 @@ public class PBETest implements Test
throws Exception
{
PBEKeySpec pbeSpec = new PBEKeySpec(password);
- SecretKeyFactory keyFact = SecretKeyFactory.getInstance(algorithm, "BC");
+ SecretKeyFactory keyFact = SecretKeyFactory.getInstance(algorithm, "SC");
PBEParameterSpec defParams = new PBEParameterSpec(salt, iterationCount);
- Cipher cipher = Cipher.getInstance(algorithm, "BC");
+ Cipher cipher = Cipher.getInstance(algorithm, "SC");
cipher.init(mode, keyFact.generateSecret(pbeSpec), defParams);
@@ -315,11 +315,11 @@ public class PBETest implements Test
try
{
- SecretKeyFactory fact = SecretKeyFactory.getInstance(hmacName, "BC");
+ SecretKeyFactory fact = SecretKeyFactory.getInstance(hmacName, "SC");
key = fact.generateSecret(new PBEKeySpec("hello".toCharArray()));
- mac = Mac.getInstance(hmacName, "BC");
+ mac = Mac.getInstance(hmacName, "SC");
}
catch (Exception e)
{
@@ -358,7 +358,7 @@ public class PBETest implements Test
//
// DES
//
- Cipher cEnc = Cipher.getInstance("DES/CBC/PKCS7Padding", "BC");
+ Cipher cEnc = Cipher.getInstance("DES/CBC/PKCS7Padding", "SC");
cEnc.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(Hex.decode("30e69252758e5346"), "DES"),
@@ -385,7 +385,7 @@ public class PBETest implements Test
//
// DESede
//
- cEnc = Cipher.getInstance("DESede/CBC/PKCS7Padding", "BC");
+ cEnc = Cipher.getInstance("DESede/CBC/PKCS7Padding", "SC");
cEnc.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(Hex.decode("732f2d33c801732b7206756cbd44f9c1c103ddd97c7cbe8e"), "DES"),
@@ -410,7 +410,7 @@ public class PBETest implements Test
//
// 40Bit RC2
//
- cEnc = Cipher.getInstance("RC2/CBC/PKCS7Padding", "BC");
+ cEnc = Cipher.getInstance("RC2/CBC/PKCS7Padding", "SC");
cEnc.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(Hex.decode("732f2d33c8"), "RC2"),
@@ -435,7 +435,7 @@ public class PBETest implements Test
//
// 128bit RC4
//
- cEnc = Cipher.getInstance("RC4", "BC");
+ cEnc = Cipher.getInstance("RC4", "SC");
cEnc.init(Cipher.ENCRYPT_MODE,
new SecretKeySpec(Hex.decode("732f2d33c801732b7206756cbd44f9c1"), "RC4"));
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PKIXPolicyMappingTest.java
index a40113fe..faf4b933 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PKIXPolicyMappingTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider.test;
+package org.spongycastle.jce.provider.test;
import java.io.IOException;
import java.math.BigInteger;
@@ -9,14 +9,14 @@ import java.security.NoSuchProviderException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.Security;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.cert.CertPathBuilder;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.PKIXBuilderParameters;
-import org.bouncycastle.jce.cert.PKIXCertPathBuilderResult;
-import org.bouncycastle.jce.cert.TrustAnchor;
-import org.bouncycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.PrincipalUtil;
+import org.spongycastle.jce.cert.CertPathBuilder;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.PKIXBuilderParameters;
+import org.spongycastle.jce.cert.PKIXCertPathBuilderResult;
+import org.spongycastle.jce.cert.TrustAnchor;
+import org.spongycastle.jce.cert.X509CertSelector;
import java.security.cert.X509Certificate;
import java.security.cert.CertificateEncodingException;
import java.security.spec.RSAPrivateCrtKeySpec;
@@ -26,18 +26,18 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.PolicyMappings;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.PolicyMappings;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.util.test.TestFailedException;
+import org.spongycastle.x509.X509V3CertificateGenerator;
public class PKIXPolicyMappingTest
extends SimpleTest
@@ -152,7 +152,7 @@ public class PKIXPolicyMappingTest
params.setInitialPolicies(requirePolicies);
}
- CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","BC");
+ CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","SC");
// CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","SUN");
PKIXCertPathBuilderResult result = null;
try
@@ -249,7 +249,7 @@ public class PKIXPolicyMappingTest
//
// set up the keys
//
- KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
+ KeyFactory fact = KeyFactory.getInstance("RSA", "SC");
PrivateKey caPrivKey = fact.generatePrivate(caPrivKeySpec);
PublicKey caPubKey = fact.generatePublic(caPubKeySpec);
PrivateKey intPrivKey = fact.generatePrivate(intPrivKeySpec);
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PSSTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/PSSTest.java
index 726f4bbc..adb663c2 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/PSSTest.java
+++ b/prov/src/test/jdk1.3/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.KeyFactory;
@@ -10,11 +10,11 @@ import java.security.Signature;
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
@@ -86,12 +86,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);
@@ -102,7 +102,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);
@@ -111,7 +111,7 @@ public class PSSTest
return new SimpleTestResult(false, "SHA1 signature verification failed");
}
- s = Signature.getInstance("SHA256WithRSA/PSS", "BC");
+ s = Signature.getInstance("SHA256WithRSA/PSS", "SC");
s.initSign(privKey, new FixedRandom(slt1a));
s.update(msg1a);
@@ -122,7 +122,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.initVerify(pubKey);
s.update(msg1a);
diff --git a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/nist/NistCertPathTest.java
index ca9a6c00..eb97da8e 100644
--- a/prov/src/test/jdk1.3/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java
+++ b/prov/src/test/jdk1.3/org/spongycastle/jce/provider/test/nist/NistCertPathTest.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.jce.provider.test.nist;
+package org.spongycastle.jce.provider.test.nist;
import java.io.FileInputStream;
import java.io.InputStream;
import java.security.Security;
-import org.bouncycastle.jce.cert.CertPath;
-import org.bouncycastle.jce.cert.CertPathBuilder;
-import org.bouncycastle.jce.cert.CertPathBuilderException;
-import org.bouncycastle.jce.cert.CertPathValidator;
-import org.bouncycastle.jce.cert.CertPathValidatorException;
-import org.bouncycastle.jce.cert.CertStore;
-import org.bouncycastle.jce.cert.CertificateFactory;
-import org.bouncycastle.jce.cert.CollectionCertStoreParameters;
-import org.bouncycastle.jce.cert.PKIXBuilderParameters;
-import org.bouncycastle.jce.cert.PKIXCertPathBuilderResult;
-import org.bouncycastle.jce.cert.PKIXCertPathValidatorResult;
-import org.bouncycastle.jce.cert.PKIXParameters;
-import org.bouncycastle.jce.cert.TrustAnchor;
+import org.spongycastle.jce.cert.CertPath;
+import org.spongycastle.jce.cert.CertPathBuilder;
+import org.spongycastle.jce.cert.CertPathBuilderException;
+import org.spongycastle.jce.cert.CertPathValidator;
+import org.spongycastle.jce.cert.CertPathValidatorException;
+import org.spongycastle.jce.cert.CertStore;
+import org.spongycastle.jce.cert.CertificateFactory;
+import org.spongycastle.jce.cert.CollectionCertStoreParameters;
+import org.spongycastle.jce.cert.PKIXBuilderParameters;
+import org.spongycastle.jce.cert.PKIXCertPathBuilderResult;
+import org.spongycastle.jce.cert.PKIXCertPathValidatorResult;
+import org.spongycastle.jce.cert.PKIXParameters;
+import org.spongycastle.jce.cert.TrustAnchor;
import java.security.cert.X509CRL;
-import org.bouncycastle.jce.cert.X509CertSelector;
+import org.spongycastle.jce.cert.X509CertSelector;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,10 +32,10 @@ import java.util.Set;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.x509.extension.X509ExtensionUtil;
/**
* NIST CertPath test data for RFC 3280
@@ -72,9 +72,9 @@ public class NistCertPathTest
public void setUp()
{
- if (Security.getProvider("BC") == null)
+ if (Security.getProvider("SC") == null)
{
- Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
+ Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider());
}
}
@@ -682,16 +682,16 @@ public class NistCertPathTest
certsAndCrls.add(endCert);
- CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(certsAndCrls);
+ CertPath certPath = CertificateFactory.getInstance("X.509","SC").generateCertPath(certsAndCrls);
for (int i = 0; i != crls.length; i++)
{
certsAndCrls.add(loadCrl(crls[i]));
}
- CertStore store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "BC");
+ CertStore store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "SC");
- CertPathValidator validator = CertPathValidator.getInstance("PKIX","BC");
+ CertPathValidator validator = CertPathValidator.getInstance("PKIX","SC");
PKIXParameters params = new PKIXParameters(trustedSet);
params.addCertStore(store);
@@ -732,9 +732,9 @@ public class NistCertPathTest
certsAndCrls.add(loadCrl(crls[i]));
}
- CertStore store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "BC");
+ CertStore store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "SC");
- CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
+ CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "SC");
X509CertSelector endSelector = new X509CertSelector();
@@ -783,7 +783,7 @@ public class NistCertPathTest
{
InputStream in = new FileInputStream(getPkitsHome() + "/certs/" + certName + ".crt");
- CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC");
cert = (X509Certificate)fact.generateCertificate(in);
@@ -812,7 +812,7 @@ public class NistCertPathTest
{
InputStream in = new FileInputStream(getPkitsHome() + "/crls/" + crlName + ".crl");
- CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
+ CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC");
crl = (X509CRL)fact.generateCRL(in);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 05:08:01 +0300