diff options
Diffstat (limited to 'pkix/src/test/jdk1.3/org')
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/crmf/test/AllTests.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/crmf/test/AllTests.java) | 80 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/path/test/CertPathTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/path/test/CertPathTest.java) | 38 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/AllTests.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AllTests.java) | 10 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/AttrCertTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AttrCertTest.java) | 64 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/BcCertTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/BcCertTest.java) | 116 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/CertTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java) | 170 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/ConverterTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/ConverterTest.java) | 16 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cert/test/PKCS10Test.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java) | 100 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cms/test/AllTests.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cms/test/AllTests.java) | 2 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/cms/test/ConverterTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/cms/test/ConverterTest.java) | 18 | ||||
-rw-r--r-- | pkix/src/test/jdk1.3/org/spongycastle/openssl/test/ParserTest.java (renamed from pkix/src/test/jdk1.3/org/bouncycastle/openssl/test/ParserTest.java) | 70 |
11 files changed, 342 insertions, 342 deletions
diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/crmf/test/AllTests.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/crmf/test/AllTests.java index c73fc1b8..ad57a1d6 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/crmf/test/AllTests.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/crmf/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.crmf.test; +package org.spongycastle.cert.crmf.test; import java.io.IOException; import java.math.BigInteger; @@ -16,45 +16,45 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers; -import org.bouncycastle.asn1.crmf.EncKeyWithID; -import org.bouncycastle.asn1.crmf.EncryptedValue; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v1CertificateBuilder; -import org.bouncycastle.cert.crmf.bc.BcFixedLengthMGF1Padder; -import org.bouncycastle.cert.crmf.EncryptedValueBuilder; -import org.bouncycastle.cert.crmf.EncryptedValuePadder; -import org.bouncycastle.cert.crmf.EncryptedValueParser; -import org.bouncycastle.cert.crmf.PKIArchiveControl; -import org.bouncycastle.cert.crmf.PKMACBuilder; -import org.bouncycastle.cert.crmf.ValueDecryptorGenerator; -import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessage; -import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder; -import org.bouncycastle.cert.crmf.jcajce.JcaEncryptedValueBuilder; -import org.bouncycastle.cert.crmf.jcajce.JcaPKIArchiveControlBuilder; -import org.bouncycastle.cert.crmf.jcajce.JceAsymmetricValueDecryptorGenerator; -import org.bouncycastle.cert.crmf.jcajce.JceCRMFEncryptorBuilder; -import org.bouncycastle.cert.crmf.jcajce.JcePKMACValuesCalculator; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.RecipientId; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientId; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JceAsymmetricKeyWrapper; -import org.bouncycastle.util.Arrays; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.crmf.CRMFObjectIdentifiers; +import org.spongycastle.asn1.crmf.EncKeyWithID; +import org.spongycastle.asn1.crmf.EncryptedValue; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v1CertificateBuilder; +import org.spongycastle.cert.crmf.bc.BcFixedLengthMGF1Padder; +import org.spongycastle.cert.crmf.EncryptedValueBuilder; +import org.spongycastle.cert.crmf.EncryptedValuePadder; +import org.spongycastle.cert.crmf.EncryptedValueParser; +import org.spongycastle.cert.crmf.PKIArchiveControl; +import org.spongycastle.cert.crmf.PKMACBuilder; +import org.spongycastle.cert.crmf.ValueDecryptorGenerator; +import org.spongycastle.cert.crmf.jcajce.JcaCertificateRequestMessage; +import org.spongycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder; +import org.spongycastle.cert.crmf.jcajce.JcaEncryptedValueBuilder; +import org.spongycastle.cert.crmf.jcajce.JcaPKIArchiveControlBuilder; +import org.spongycastle.cert.crmf.jcajce.JceAsymmetricValueDecryptorGenerator; +import org.spongycastle.cert.crmf.jcajce.JceCRMFEncryptorBuilder; +import org.spongycastle.cert.crmf.jcajce.JcePKMACValuesCalculator; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cert.jcajce.JcaX509v1CertificateBuilder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.RecipientId; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientId; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.operator.jcajce.JceAsymmetricKeyWrapper; +import org.spongycastle.util.Arrays; public class AllTests extends TestCase diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/path/test/CertPathTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/path/test/CertPathTest.java index d487afb0..82cbe1d8 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/path/test/CertPathTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/path/test/CertPathTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.path.test; +package org.spongycastle.cert.path.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,19 +9,19 @@ import java.security.NoSuchProviderException; import java.security.PublicKey; import java.security.Security; import java.security.SignatureException; -import org.bouncycastle.jce.cert.CertPath; -import org.bouncycastle.jce.cert.CertPathBuilder; -import org.bouncycastle.jce.cert.CertPathBuilderException; -import org.bouncycastle.jce.cert.CertPathBuilderResult; -import org.bouncycastle.jce.cert.CertStore; +import org.spongycastle.jce.cert.CertPath; +import org.spongycastle.jce.cert.CertPathBuilder; +import org.spongycastle.jce.cert.CertPathBuilderException; +import org.spongycastle.jce.cert.CertPathBuilderResult; +import org.spongycastle.jce.cert.CertStore; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import org.bouncycastle.jce.cert.CertificateFactory; -import org.bouncycastle.jce.cert.CollectionCertStoreParameters; -import org.bouncycastle.jce.cert.PKIXBuilderParameters; -import org.bouncycastle.jce.cert.TrustAnchor; -import org.bouncycastle.jce.cert.X509CertSelector; +import org.spongycastle.jce.cert.CertificateFactory; +import org.spongycastle.jce.cert.CollectionCertStoreParameters; +import org.spongycastle.jce.cert.PKIXBuilderParameters; +import org.spongycastle.jce.cert.TrustAnchor; +import org.spongycastle.jce.cert.X509CertSelector; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Collections; @@ -31,10 +31,10 @@ import java.util.List; import java.util.Set; import java.util.Vector; -import org.bouncycastle.jce.X509Principal; -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.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class CertPathTest extends SimpleTest @@ -142,7 +142,7 @@ public class CertPathTest try { CertificateFactory cFac = CertificateFactory.getInstance("X.509", - "BC"); + "SC"); arr = os.toByteArray(); is = new ByteArrayInputStream(arr); cFac.generateCertPath(is); @@ -160,7 +160,7 @@ public class CertPathTest certCol.add(cf.generateCertificate(new ByteArrayInputStream(certC))); certCol.add(cf.generateCertificate(new ByteArrayInputStream(certD))); - CertPathBuilder pathBuilder = CertPathBuilder.getInstance("PKIX", "BC"); + CertPathBuilder pathBuilder = CertPathBuilder.getInstance("PKIX", "SC"); X509CertSelector select = new X509CertSelector(); select.setSubject(((X509Principal)((X509Certificate)certCol.get(0)).getSubjectDN()).getEncoded()); @@ -187,7 +187,7 @@ public class CertPathTest public void performTest() throws Exception { - 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)); @@ -240,7 +240,7 @@ public class CertPathTest // list = new ArrayList(); - CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(list); + CertPath certPath = CertificateFactory.getInstance("X.509","SC").generateCertPath(list); if (certPath.getCertificates().size() != 0) { fail("list wrong size."); diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AllTests.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/AllTests.java index 5f7d1542..d602d8fb 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AllTests.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/AllTests.java @@ -1,19 +1,19 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; public class AllTests extends TestCase { public void testSimpleTests() { - org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new CertTest(), new PKCS10Test(), new AttrCertSelectorTest(), new AttrCertTest(), new X509ExtensionUtilsTest() }; + org.spongycastle.util.test.Test[] tests = new org.spongycastle.util.test.Test[] { new CertTest(), new PKCS10Test(), new AttrCertSelectorTest(), new AttrCertTest(), new X509ExtensionUtilsTest() }; for (int i = 0; i != tests.length; i++) { @@ -39,7 +39,7 @@ public class AllTests { TestSuite suite = new TestSuite("Cert Tests"); - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { Security.addProvider(new BouncyCastleProvider()); } diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AttrCertTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/AttrCertTest.java index f4723f88..525971e6 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/AttrCertTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/AttrCertTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,30 +17,30 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.bouncycastle.asn1.ASN1Encodable; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1String; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.Attribute; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.cert.AttributeCertificateHolder; -import org.bouncycastle.cert.AttributeCertificateIssuer; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.ASN1Encodable; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1String; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.Attribute; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.cert.AttributeCertificateHolder; +import org.spongycastle.cert.AttributeCertificateIssuer; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509v2AttributeCertificateBuilder; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class AttrCertTest extends SimpleTest @@ -166,7 +166,7 @@ public class AttrCertTest throws Exception { X509AttributeCertificateHolder attrCert = new X509AttributeCertificateHolder(certWithBaseCertificateID); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509Certificate cert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(holderCertWithBaseCertificateID)); AttributeCertificateHolder holder = attrCert.getHolder(); @@ -258,7 +258,7 @@ public class AttrCertTest private void testGenerateWithCert() throws Exception { - CertificateFactory fact = CertificateFactory.getInstance("X.509","BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509","SC"); X509Certificate iCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert)); // @@ -274,7 +274,7 @@ public class AttrCertTest PrivateKey privKey; PublicKey pubKey; - KeyFactory kFact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory kFact = KeyFactory.getInstance("RSA", "SC"); privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC); pubKey = kFact.generatePublic(pubKeySpec); @@ -372,7 +372,7 @@ public class AttrCertTest private void testGenerateWithPrincipal() throws Exception { - CertificateFactory fact = CertificateFactory.getInstance("X.509","BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509","SC"); X509Certificate iCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert)); // @@ -388,7 +388,7 @@ public class AttrCertTest PrivateKey privKey; PublicKey pubKey; - KeyFactory kFact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory kFact = KeyFactory.getInstance("RSA", "SC"); privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC); pubKey = kFact.generatePublic(pubKeySpec); @@ -459,7 +459,7 @@ public class AttrCertTest throws Exception { X509AttributeCertificateHolder aCert = new X509AttributeCertificateHolder(attrCert); - CertificateFactory fact = CertificateFactory.getInstance("X.509","BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509","SC"); X509Certificate sCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert)); if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(sCert))) @@ -523,7 +523,7 @@ public class AttrCertTest PrivateKey privKey; PublicKey pubKey; - KeyFactory kFact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory kFact = KeyFactory.getInstance("RSA", "SC"); privKey = kFact.generatePrivate(privKeySpec); pubKey = kFact.generatePublic(pubKeySpec); diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/BcCertTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/BcCertTest.java index e414c856..0f13da9e 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/BcCertTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/BcCertTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -17,62 +17,62 @@ import java.util.List; import java.util.Set; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1Enumerated; -import org.bouncycastle.asn1.ASN1Object; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERBitString; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x500.X500NameBuilder; -import org.bouncycastle.asn1.x500.style.RFC4519Style; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -import org.bouncycastle.asn1.x509.CRLReason; -import org.bouncycastle.asn1.x509.Certificate; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.ExtensionsGenerator; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.KeyUsage; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.cert.CertException; -import org.bouncycastle.cert.X509CRLEntryHolder; -import org.bouncycastle.cert.X509CRLHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v1CertificateBuilder; -import org.bouncycastle.cert.X509v2CRLBuilder; -import org.bouncycastle.cert.X509v3CertificateBuilder; -import org.bouncycastle.cert.bc.BcX509ExtensionUtils; -import org.bouncycastle.cert.bc.BcX509v1CertificateBuilder; -import org.bouncycastle.cert.bc.BcX509v3CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator; -import org.bouncycastle.crypto.generators.DSAKeyPairGenerator; -import org.bouncycastle.crypto.generators.DSAParametersGenerator; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.DSAKeyGenerationParameters; -import org.bouncycastle.crypto.params.DSAParameters; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory; -import org.bouncycastle.cert.test.PEMData; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.bc.BcDSAContentSignerBuilder; -import org.bouncycastle.operator.bc.BcDSAContentVerifierProviderBuilder; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1Enumerated; +import org.spongycastle.asn1.ASN1Object; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DERBitString; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x500.X500NameBuilder; +import org.spongycastle.asn1.x500.style.RFC4519Style; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.AuthorityKeyIdentifier; +import org.spongycastle.asn1.x509.CRLReason; +import org.spongycastle.asn1.x509.Certificate; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.Extensions; +import org.spongycastle.asn1.x509.ExtensionsGenerator; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.KeyPurposeId; +import org.spongycastle.asn1.x509.KeyUsage; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.cert.CertException; +import org.spongycastle.cert.X509CRLEntryHolder; +import org.spongycastle.cert.X509CRLHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v1CertificateBuilder; +import org.spongycastle.cert.X509v2CRLBuilder; +import org.spongycastle.cert.X509v3CertificateBuilder; +import org.spongycastle.cert.bc.BcX509ExtensionUtils; +import org.spongycastle.cert.bc.BcX509v1CertificateBuilder; +import org.spongycastle.cert.bc.BcX509v3CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.AsymmetricCipherKeyPairGenerator; +import org.spongycastle.crypto.generators.DSAKeyPairGenerator; +import org.spongycastle.crypto.generators.DSAParametersGenerator; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.DSAKeyGenerationParameters; +import org.spongycastle.crypto.params.DSAParameters; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.crypto.params.RSAKeyParameters; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.crypto.util.SubjectPublicKeyInfoFactory; +import org.spongycastle.cert.test.PEMData; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.ContentVerifierProvider; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.bc.BcDSAContentSignerBuilder; +import org.spongycastle.operator.bc.BcDSAContentVerifierProviderBuilder; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.operator.bc.BcRSAContentVerifierProviderBuilder; +import org.spongycastle.util.encoders.Base64; public class BcCertTest extends TestCase @@ -1248,7 +1248,7 @@ public class BcCertTest private void pemTest() throws Exception { - CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); X509Certificate cert = readPEMCert(cf, PEMData.CERTIFICATE_1); if (cert == null) diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/CertTest.java index 2c5a8594..408e07e2 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/CertTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/CertTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -31,78 +31,78 @@ import java.util.Iterator; import java.util.Set; import java.util.Vector; -import org.bouncycastle.asn1.ASN1Encodable; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1Enumerated; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.ASN1Enumerated; -import org.bouncycastle.asn1.DERNull; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.RSAPublicKey; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x500.X500NameBuilder; -import org.bouncycastle.asn1.x500.style.BCStyle; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -import org.bouncycastle.asn1.x509.CRLReason; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.ExtensionsGenerator; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.IssuingDistributionPoint; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x509.X509CertificateStructure; -import org.bouncycastle.asn1.x509.X509Extension; -import org.bouncycastle.asn1.x509.X509Extensions; -import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; -import org.bouncycastle.cert.X509CRLEntryHolder; -import org.bouncycastle.cert.X509CRLHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v1CertificateBuilder; -import org.bouncycastle.cert.X509v2CRLBuilder; -import org.bouncycastle.cert.X509v3CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509CRLConverter; -import org.bouncycastle.cert.jcajce.JcaX509CRLHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509v2CRLBuilder; -import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; -import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.jce.PrincipalUtil; -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.operator.ContentSigner; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure; -import org.bouncycastle.x509.extension.X509ExtensionUtil; +import org.spongycastle.asn1.ASN1Encodable; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1Enumerated; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1Primitive; +import org.spongycastle.asn1.ASN1Enumerated; +import org.spongycastle.asn1.DERNull; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.RSAPublicKey; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x500.X500NameBuilder; +import org.spongycastle.asn1.x500.style.BCStyle; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.AuthorityKeyIdentifier; +import org.spongycastle.asn1.x509.CRLReason; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.ExtensionsGenerator; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.IssuingDistributionPoint; +import org.spongycastle.asn1.x509.KeyPurposeId; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x509.X509CertificateStructure; +import org.spongycastle.asn1.x509.X509Extension; +import org.spongycastle.asn1.x509.X509Extensions; +import org.spongycastle.asn1.x9.X9ObjectIdentifiers; +import org.spongycastle.cert.X509CRLEntryHolder; +import org.spongycastle.cert.X509CRLHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v1CertificateBuilder; +import org.spongycastle.cert.X509v2CRLBuilder; +import org.spongycastle.cert.X509v3CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509CRLConverter; +import org.spongycastle.cert.jcajce.JcaX509CRLHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaX509v1CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509v2CRLBuilder; +import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder; +import org.spongycastle.crypto.params.RSAKeyParameters; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.jce.PrincipalUtil; +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.operator.ContentSigner; +import org.spongycastle.operator.ContentVerifierProvider; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.operator.bc.BcRSAContentVerifierProviderBuilder; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.x509.extension.AuthorityKeyIdentifierStructure; +import org.spongycastle.x509.extension.X509ExtensionUtil; public class CertTest extends SimpleTest { - private static final String BC = org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME; + private static final String BC = org.spongycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME; // test CA byte[] testCAp12 = Base64.decode( @@ -1192,7 +1192,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); @@ -1217,7 +1217,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); @@ -1246,7 +1246,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); @@ -1278,7 +1278,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); @@ -1335,7 +1335,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); @@ -1416,7 +1416,7 @@ public class CertTest } 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); @@ -1463,7 +1463,7 @@ public class CertTest cert.verify(cert.getPublicKey()); bIn = new ByteArrayInputStream(cert.getEncoded()); - certFact = CertificateFactory.getInstance("X.509", "BC"); + certFact = CertificateFactory.getInstance("X.509", "SC"); cert = (X509Certificate)certFact.generateCertificate(bIn); @@ -2651,7 +2651,7 @@ public class CertTest private void testDirect() throws Exception { - KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC"); + KeyStore keyStore = KeyStore.getInstance("PKCS12", "SC"); ByteArrayInputStream input = new ByteArrayInputStream(testCAp12); @@ -2668,13 +2668,13 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); @@ -2702,7 +2702,7 @@ public class CertTest private void testIndirect() throws Exception { - KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC"); + KeyStore keyStore = KeyStore.getInstance("PKCS12", "SC"); ByteArrayInputStream input = new ByteArrayInputStream(testCAp12); @@ -2727,13 +2727,13 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); @@ -2762,7 +2762,7 @@ public class CertTest private void testMalformedIndirect() throws Exception { - KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC"); + KeyStore keyStore = KeyStore.getInstance("PKCS12", "SC"); ByteArrayInputStream input = new ByteArrayInputStream(testCAp12); @@ -2785,13 +2785,13 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/ConverterTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/ConverterTest.java index 694f2cb2..efc1191c 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/ConverterTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/ConverterTest.java @@ -1,17 +1,17 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.math.BigInteger; -import org.bouncycastle.jce.cert.X509CertSelector; +import org.spongycastle.jce.cert.X509CertSelector; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.cert.selector.X509CertificateHolderSelector; -import org.bouncycastle.cert.selector.jcajce.JcaSelectorConverter; -import org.bouncycastle.cert.selector.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.util.Arrays; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.cert.selector.X509CertificateHolderSelector; +import org.spongycastle.cert.selector.jcajce.JcaSelectorConverter; +import org.spongycastle.cert.selector.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.util.Arrays; public class ConverterTest extends TestCase diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/PKCS10Test.java index 2865e825..15a43d63 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cert/test/PKCS10Test.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cert/test/PKCS10Test.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.math.BigInteger; import java.security.KeyFactory; @@ -13,43 +13,43 @@ import java.security.spec.RSAPrivateCrtKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.Vector; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.Attribute; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x500.X500NameBuilder; -import org.bouncycastle.asn1.x500.style.BCStyle; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.KeyUsage; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x509.X509Extension; -import org.bouncycastle.asn1.x509.X509Extensions; -import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; -import org.bouncycastle.jce.ECGOST3410NamedCurveTable; -import org.bouncycastle.jce.ECNamedCurveTable; -import org.bouncycastle.jce.interfaces.ECPointEncoder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; -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.operator.ContentSigner; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.cert.bc.BcX509ExtensionUtils; -import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; -import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest; -import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers; +import org.spongycastle.asn1.pkcs.Attribute; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x500.X500NameBuilder; +import org.spongycastle.asn1.x500.style.BCStyle; +import org.spongycastle.asn1.x509.BasicConstraints; +import org.spongycastle.asn1.x509.KeyUsage; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x509.X509Extension; +import org.spongycastle.asn1.x509.X509Extensions; +import org.spongycastle.asn1.x9.X9ObjectIdentifiers; +import org.spongycastle.jce.ECGOST3410NamedCurveTable; +import org.spongycastle.jce.ECNamedCurveTable; +import org.spongycastle.jce.interfaces.ECPointEncoder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ECNamedCurveParameterSpec; +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.operator.ContentSigner; +import org.spongycastle.operator.ContentVerifierProvider; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.cert.bc.BcX509ExtensionUtils; +import org.spongycastle.pkcs.PKCS10CertificationRequest; +import org.spongycastle.pkcs.PKCS10CertificationRequestBuilder; +import org.spongycastle.pkcs.jcajce.JcaPKCS10CertificationRequest; +import org.spongycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; /** **/ @@ -106,7 +106,7 @@ public class PKCS10Test private void generationTest(int keySize, String keyName, String sigName, String provider) throws Exception { - KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyName, "BC"); + KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyName, "SC"); kpg.initialize(keySize); @@ -147,7 +147,7 @@ public class PKCS10Test throws Exception { ECNamedCurveParameterSpec spec = ECNamedCurveTable.getParameterSpec(curveOid.getId()); - KeyPairGenerator ecGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator ecGen = KeyPairGenerator.getInstance("ECDSA", "SC"); ecGen.initialize(spec); @@ -209,7 +209,7 @@ public class PKCS10Test fail("ECDSA parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -248,7 +248,7 @@ public class PKCS10Test PrivateKey privKey; PublicKey pubKey; - KeyFactory fact = KeyFactory.getInstance("ECDSA", "BC"); + KeyFactory fact = KeyFactory.getInstance("ECDSA", "SC"); privKey = fact.generatePrivate(privKeySpec); pubKey = fact.generatePublic(pubKeySpec); @@ -310,7 +310,7 @@ public class PKCS10Test throws Exception { String algorithm = "GOST3411withECGOST3410"; - KeyPairGenerator ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "BC"); + KeyPairGenerator ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "SC"); ecGostKpg.initialize(ECGOST3410NamedCurveTable.getParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom()); @@ -344,7 +344,7 @@ public class PKCS10Test fail("ECGOST parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -373,7 +373,7 @@ public class PKCS10Test 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); @@ -401,7 +401,7 @@ public class PKCS10Test fail("PSS parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -417,7 +417,7 @@ public class PKCS10Test private void nullPointerTest() throws Exception { - KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "SC"); keyGen.initialize(1024, new SecureRandom()); KeyPair pair = keyGen.generateKeyPair(); @@ -484,8 +484,8 @@ public class PKCS10Test public void performTest() throws Exception { - generationTest(512, "RSA", "SHA1withRSA", "BC"); - generationTest(512, "GOST3410", "GOST3411withGOST3410", "BC"); + generationTest(512, "RSA", "SHA1withRSA", "SC"); + generationTest(512, "GOST3410", "GOST3411withGOST3410", "SC"); if (Security.getProvider("SunRsaSign") != null) { @@ -528,7 +528,7 @@ public class PKCS10Test } // elliptic curve openSSL - KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "SC"); ECCurve curve = new ECCurve.Fp( new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cms/test/AllTests.java b/pkix/src/test/jdk1.3/org/spongycastle/cms/test/AllTests.java index 2a7f57e0..722e197b 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cms/test/AllTests.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cms/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/cms/test/ConverterTest.java b/pkix/src/test/jdk1.3/org/spongycastle/cms/test/ConverterTest.java index b46557cd..4fb7b5b0 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/cms/test/ConverterTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/cms/test/ConverterTest.java @@ -1,18 +1,18 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.math.BigInteger; -import org.bouncycastle.jce.cert.X509CertSelector; +import org.spongycastle.jce.cert.X509CertSelector; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.cms.KeyTransRecipientId; -import org.bouncycastle.cms.SignerId; -import org.bouncycastle.cms.jcajce.JcaSelectorConverter; -import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.util.Arrays; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.cms.KeyTransRecipientId; +import org.spongycastle.cms.SignerId; +import org.spongycastle.cms.jcajce.JcaSelectorConverter; +import org.spongycastle.cms.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.util.Arrays; public class ConverterTest extends TestCase diff --git a/pkix/src/test/jdk1.3/org/bouncycastle/openssl/test/ParserTest.java b/pkix/src/test/jdk1.3/org/spongycastle/openssl/test/ParserTest.java index 73bae2ce..b4f932c4 100644 --- a/pkix/src/test/jdk1.3/org/bouncycastle/openssl/test/ParserTest.java +++ b/pkix/src/test/jdk1.3/org/spongycastle/openssl/test/ParserTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openssl.test; +package org.spongycastle.openssl.test; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -20,27 +20,27 @@ import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.RSAPrivateCrtKey; import java.security.interfaces.RSAPrivateKey; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; -import org.bouncycastle.asn1.cms.ContentInfo; -import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openssl.PEMDecryptorProvider; -import org.bouncycastle.openssl.PEMEncryptedKeyPair; -import org.bouncycastle.openssl.PEMKeyPair; -import org.bouncycastle.openssl.PEMParser; -import org.bouncycastle.openssl.PEMWriter; -import org.bouncycastle.openssl.PasswordFinder; -import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; -import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder; -import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; -import org.bouncycastle.operator.InputDecryptorProvider; -import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.cms.CMSObjectIdentifiers; +import org.spongycastle.asn1.cms.ContentInfo; +import org.spongycastle.asn1.pkcs.PrivateKeyInfo; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x9.ECNamedCurveTable; +import org.spongycastle.asn1.x9.X9ECParameters; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openssl.PEMDecryptorProvider; +import org.spongycastle.openssl.PEMEncryptedKeyPair; +import org.spongycastle.openssl.PEMKeyPair; +import org.spongycastle.openssl.PEMParser; +import org.spongycastle.openssl.PEMWriter; +import org.spongycastle.openssl.PasswordFinder; +import org.spongycastle.openssl.jcajce.JcaPEMKeyConverter; +import org.spongycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder; +import org.spongycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; +import org.spongycastle.operator.InputDecryptorProvider; +import org.spongycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; +import org.spongycastle.util.test.SimpleTest; /** * basic class for reading test.pem - the password is "secret" @@ -137,9 +137,9 @@ public class ParserTest pemPair = (PEMKeyPair)pemRd.readObject(); - pair = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(pemPair); + pair = new JcaPEMKeyConverter().setProvider("SC").getKeyPair(pemPair); - Signature sgr = Signature.getInstance("ECDSA", "BC"); + Signature sgr = Signature.getInstance("ECDSA", "SC"); sgr.initSign(pair.getPrivate()); @@ -176,9 +176,9 @@ public class ParserTest pemPair = (PEMKeyPair)pemRd.readObject(); - pair = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(pemPair); + pair = new JcaPEMKeyConverter().setProvider("SC").getKeyPair(pemPair); - sgr = Signature.getInstance("ECDSA", "BC"); + sgr = Signature.getInstance("ECDSA", "SC"); sgr.initSign(pair.getPrivate()); @@ -210,13 +210,13 @@ public class ParserTest // // writer/parser test // - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC"); pair = kpGen.generateKeyPair(); keyPairTest("RSA", pair); - kpGen = KeyPairGenerator.getInstance("DSA", "BC"); + kpGen = KeyPairGenerator.getInstance("DSA", "SC"); kpGen.initialize(512, new SecureRandom()); pair = kpGen.generateKeyPair(); @@ -272,7 +272,7 @@ public class ParserTest doDudPasswordTest("3ee7a8", 10, "DER length more than 4 bytes: 57"); doDudPasswordTest("41af75", 11, "unknown tag 16 encountered"); doDudPasswordTest("1704a5", 12, "corrupted stream detected"); - doDudPasswordTest("1c5822", 13, "unknown object in getInstance: org.bouncycastle.asn1.DERUTF8String"); + doDudPasswordTest("1c5822", 13, "unknown object in getInstance: org.spongycastle.asn1.DERUTF8String"); doDudPasswordTest("5a3d16", 14, "corrupted stream detected"); doDudPasswordTest("8d0c97", 15, "corrupted stream detected"); doDudPasswordTest("bc0daf", 16, "corrupted stream detected"); @@ -285,7 +285,7 @@ public class ParserTest pemRd = openPEMResource("enckey.pem"); PKCS8EncryptedPrivateKeyInfo encPrivKeyInfo = (PKCS8EncryptedPrivateKeyInfo)pemRd.readObject(); - JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); + JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("SC"); RSAPrivateCrtKey privKey = (RSAPrivateCrtKey)converter.getPrivateKey(encPrivKeyInfo.decryptPrivateKeyInfo(pkcs8Prov)); @@ -333,7 +333,7 @@ public class ParserTest pemRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray()))); SubjectPublicKeyInfo pub = SubjectPublicKeyInfo.getInstance(pemRd.readObject()); - JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); + JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("SC"); PublicKey k = converter.getPublicKey(pub); @@ -414,8 +414,8 @@ public class ParserTest Class expectedPrivKeyClass) throws IOException { - JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); - PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build("changeit".toCharArray()); + JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("SC"); + PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("SC").build("changeit".toCharArray()); PEMParser pr = openPEMResource("data/" + fileName); Object o = pr.readObject(); @@ -441,7 +441,7 @@ public class ParserTest // cause an underlying class cast exception. try { - PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build(password.toCharArray()); + PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("SC").build(password.toCharArray()); PEMParser pemRd = openPEMResource("test.pem"); Object o; @@ -465,7 +465,7 @@ public class ParserTest private void doNoPasswordTest() throws IOException { - PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build("".toCharArray()); + PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("SC").build("".toCharArray()); PEMParser pemRd = openPEMResource("smimenopw.pem"); Object o; |