diff options
Diffstat (limited to 'pkix/src/test/java/org')
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/cmp/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/cert/cmp/test/AllTests.java) | 74 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/crmf/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/cert/crmf/test/AllTests.java) | 80 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/ocsp/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/cert/ocsp/test/AllTests.java) | 8 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java) | 68 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTestUtil.java (renamed from pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java) | 26 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/path/test/CertPathTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/path/test/CertPathTest.java) | 16 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/path/test/CertPathValidationTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java) | 52 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/AllTests.java) | 10 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/AttrCertSelectorTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java) | 52 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/AttrCertTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/AttrCertTest.java) | 64 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertSelectorTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java) | 44 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/BcAttrCertTest.java) | 60 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/BcCertTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java) | 114 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/BcPKCS10Test.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/BcPKCS10Test.java) | 60 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/CertTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java) | 178 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/ConverterTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/ConverterTest.java) | 14 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/PEMData.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/PEMData.java) | 2 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/PKCS10Test.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java) | 100 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/SHA1DigestCalculator.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cert/test/X509ExtensionUtilsTest.java (renamed from pkix/src/test/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java) | 18 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/AllTests.java) | 2 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/BcEnvelopedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java) | 86 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/BcSignedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java) | 112 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/CMSSampleMessages.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/CMSSampleMessages.java) | 4 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/CMSTestSetup.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/CMSTestSetup.java) | 6 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/CMSTestUtil.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/CMSTestUtil.java) | 94 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/ConverterTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/ConverterTest.java) | 16 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/MiscDataStreamTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java) | 46 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataStreamTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java) | 38 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java) | 62 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataStreamTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataTest.java) | 18 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataStreamTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java) | 66 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java) | 106 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataStreamTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java) | 78 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java) | 122 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/NullProviderTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java) | 64 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/Rfc4134Test.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java) | 68 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/SHA1DigestCalculator.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/cms/test/SunProviderTest.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java) | 68 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/dvcs/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/dvcs/test/AllTests.java) | 66 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/dvcs/test/DVCSParseTest.java (renamed from pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java) | 64 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/dvcs/test/DVCSTestSetup.java (renamed from pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java) | 4 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/dvcs/test/SHA1DigestCalculator.java (renamed from pkix/src/test/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/eac/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/eac/test/AllTests.java) | 36 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/eac/test/EACTestSetup.java (renamed from pkix/src/test/java/org/bouncycastle/eac/test/EACTestSetup.java) | 6 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/mozilla/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/mozilla/test/AllTests.java) | 8 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/mozilla/test/SPKACTest.java (renamed from pkix/src/test/java/org/bouncycastle/mozilla/test/SPKACTest.java) | 26 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/openssl/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/openssl/test/AllTests.java) | 48 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/openssl/test/ParserTest.java (renamed from pkix/src/test/java/org/bouncycastle/openssl/test/ParserTest.java) | 70 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/openssl/test/WriterTest.java (renamed from pkix/src/test/java/org/bouncycastle/openssl/test/WriterTest.java) | 40 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/pkcs/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/pkcs/test/AllTests.java) | 2 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/pkcs/test/BCTestSetup.java (renamed from pkix/src/test/java/org/bouncycastle/pkcs/test/BCTestSetup.java) | 6 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/pkcs/test/PKCS10Test.java (renamed from pkix/src/test/java/org/bouncycastle/pkcs/test/PKCS10Test.java) | 22 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/pkcs/test/PfxPduTest.java (renamed from pkix/src/test/java/org/bouncycastle/pkcs/test/PfxPduTest.java) | 132 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/GenTimeAccuracyUnitTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/GenTimeAccuracyUnitTest.java) | 6 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/TimeStampTokenInfoUnitTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/TimeStampTokenInfoUnitTest.java) | 10 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/AllTests.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/AllTests.java) | 4 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java) | 46 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataParserTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java) | 14 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/NewTSPTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java) | 88 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/ParseTest.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/ParseTest.java) | 34 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/SHA1DigestCalculator.java (renamed from pkix/src/test/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/SHA256DigestCalculator.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java) | 12 | ||||
| -rw-r--r-- | pkix/src/test/java/org/spongycastle/tsp/test/TSPTestUtil.java (renamed from pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java) | 36 |
66 files changed, 1474 insertions, 1474 deletions
diff --git a/pkix/src/test/java/org/bouncycastle/cert/cmp/test/AllTests.java b/pkix/src/test/java/org/spongycastle/cert/cmp/test/AllTests.java index 27630832..ca633903 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/cmp/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/cert/cmp/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.cmp.test; +package org.spongycastle.cert.cmp.test; import java.io.FileInputStream; import java.io.IOException; @@ -15,42 +15,42 @@ import java.util.Date; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.cmp.CertConfirmContent; -import org.bouncycastle.asn1.cmp.CertRepMessage; -import org.bouncycastle.asn1.cmp.PKIBody; -import org.bouncycastle.asn1.cmp.PKIMessage; -import org.bouncycastle.asn1.crmf.CertReqMessages; -import org.bouncycastle.asn1.crmf.CertReqMsg; -import org.bouncycastle.asn1.crmf.ProofOfPossession; -import org.bouncycastle.asn1.crmf.SubsequentMessage; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.cert.CertException; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v3CertificateBuilder; -import org.bouncycastle.cert.cmp.CertificateConfirmationContent; -import org.bouncycastle.cert.cmp.CertificateConfirmationContentBuilder; -import org.bouncycastle.cert.cmp.CertificateStatus; -import org.bouncycastle.cert.cmp.GeneralPKIMessage; -import org.bouncycastle.cert.cmp.ProtectedPKIMessage; -import org.bouncycastle.cert.cmp.ProtectedPKIMessageBuilder; -import org.bouncycastle.cert.crmf.CertificateRequestMessage; -import org.bouncycastle.cert.crmf.CertificateRequestMessageBuilder; -import org.bouncycastle.cert.crmf.PKMACBuilder; -import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder; -import org.bouncycastle.cert.crmf.jcajce.JcePKMACValuesCalculator; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.ASN1Primitive; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.cmp.CertConfirmContent; +import org.spongycastle.asn1.cmp.CertRepMessage; +import org.spongycastle.asn1.cmp.PKIBody; +import org.spongycastle.asn1.cmp.PKIMessage; +import org.spongycastle.asn1.crmf.CertReqMessages; +import org.spongycastle.asn1.crmf.CertReqMsg; +import org.spongycastle.asn1.crmf.ProofOfPossession; +import org.spongycastle.asn1.crmf.SubsequentMessage; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.cert.CertException; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v3CertificateBuilder; +import org.spongycastle.cert.cmp.CertificateConfirmationContent; +import org.spongycastle.cert.cmp.CertificateConfirmationContentBuilder; +import org.spongycastle.cert.cmp.CertificateStatus; +import org.spongycastle.cert.cmp.GeneralPKIMessage; +import org.spongycastle.cert.cmp.ProtectedPKIMessage; +import org.spongycastle.cert.cmp.ProtectedPKIMessageBuilder; +import org.spongycastle.cert.crmf.CertificateRequestMessage; +import org.spongycastle.cert.crmf.CertificateRequestMessageBuilder; +import org.spongycastle.cert.crmf.PKMACBuilder; +import org.spongycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder; +import org.spongycastle.cert.crmf.jcajce.JcePKMACValuesCalculator; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.ContentVerifierProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.io.Streams; public class AllTests extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cert/crmf/test/AllTests.java b/pkix/src/test/java/org/spongycastle/cert/crmf/test/AllTests.java index 712210e4..b5634684 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/crmf/test/AllTests.java +++ b/pkix/src/test/java/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; @@ -18,45 +18,45 @@ import javax.security.auth.x500.X500Principal; 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.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.bc.BcFixedLengthMGF1Padder; -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.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.bc.BcFixedLengthMGF1Padder; +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/java/org/bouncycastle/cert/ocsp/test/AllTests.java b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/AllTests.java index 1f720de3..cd739e62 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/ocsp/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/AllTests.java @@ -1,12 +1,12 @@ -package org.bouncycastle.cert.ocsp.test; +package org.spongycastle.cert.ocsp.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 @@ -15,7 +15,7 @@ public class AllTests { Security.addProvider(new BouncyCastleProvider()); - org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new OCSPTest() }; + org.spongycastle.util.test.Test[] tests = new org.spongycastle.util.test.Test[] { new OCSPTest() }; for (int i = 0; i != tests.length; i++) { diff --git a/pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTest.java index 5c57c7f6..aa2bdeca 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.ocsp.test; +package org.spongycastle.cert.ocsp.test; import java.io.IOException; import java.math.BigInteger; @@ -9,38 +9,38 @@ import java.util.Random; import java.util.Set; import java.util.Vector; -import org.bouncycastle.asn1.ASN1Encodable; -import org.bouncycastle.asn1.ASN1Exception; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.ExtensionsGenerator; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.cert.CertIOException; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.ocsp.BasicOCSPResp; -import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder; -import org.bouncycastle.cert.ocsp.CertificateID; -import org.bouncycastle.cert.ocsp.CertificateStatus; -import org.bouncycastle.cert.ocsp.OCSPReq; -import org.bouncycastle.cert.ocsp.OCSPReqBuilder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cert.ocsp.OCSPRespBuilder; -import org.bouncycastle.cert.ocsp.Req; -import org.bouncycastle.cert.ocsp.RespID; -import org.bouncycastle.cert.ocsp.SingleResp; -import org.bouncycastle.cert.ocsp.jcajce.JcaBasicOCSPRespBuilder; -import org.bouncycastle.jce.X509Principal; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.ASN1Encodable; +import org.spongycastle.asn1.ASN1Exception; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.ocsp.OCSPObjectIdentifiers; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.ExtensionsGenerator; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.cert.CertIOException; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cert.ocsp.BasicOCSPResp; +import org.spongycastle.cert.ocsp.BasicOCSPRespBuilder; +import org.spongycastle.cert.ocsp.CertificateID; +import org.spongycastle.cert.ocsp.CertificateStatus; +import org.spongycastle.cert.ocsp.OCSPReq; +import org.spongycastle.cert.ocsp.OCSPReqBuilder; +import org.spongycastle.cert.ocsp.OCSPResp; +import org.spongycastle.cert.ocsp.OCSPRespBuilder; +import org.spongycastle.cert.ocsp.Req; +import org.spongycastle.cert.ocsp.RespID; +import org.spongycastle.cert.ocsp.SingleResp; +import org.spongycastle.cert.ocsp.jcajce.JcaBasicOCSPRespBuilder; +import org.spongycastle.jce.X509Principal; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class OCSPTest extends SimpleTest @@ -266,7 +266,7 @@ public class OCSPTest + "ClrcOKZWKOWa14XJy/DJk6nlOiq5W2AglUt8JVOpa5oVdiNRIT2WoGnpqVV9" + "tUeoWog="); - private static final String BC = "BC"; + private static final String BC = "SC"; public String getName() { diff --git a/pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTestUtil.java index cab31e76..2dcde313 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java +++ b/pkix/src/test/java/org/spongycastle/cert/ocsp/test/OCSPTestUtil.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.ocsp.test; +package org.spongycastle.cert.ocsp.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -13,16 +13,16 @@ import java.util.Date; import javax.crypto.KeyGenerator; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.asn1.x509.X509Extensions; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.cert.bc.BcX509ExtensionUtils; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.x509.AuthorityKeyIdentifier; +import org.spongycastle.asn1.x509.BasicConstraints; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.asn1.x509.X509Extensions; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.cert.bc.BcX509ExtensionUtils; +import org.spongycastle.x509.X509V3CertificateGenerator; public class OCSPTestUtil { @@ -44,12 +44,12 @@ public class OCSPTestUtil { rand = new SecureRandom(); - kpg = KeyPairGenerator.getInstance("RSA", "BC"); + kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024, rand); serialNumber = new BigInteger("1"); - eckpg = KeyPairGenerator.getInstance("ECDSA", "BC"); + eckpg = KeyPairGenerator.getInstance("ECDSA", "SC"); eckpg.initialize(192, rand); } catch(Exception ex) diff --git a/pkix/src/test/java/org/bouncycastle/cert/path/test/CertPathTest.java b/pkix/src/test/java/org/spongycastle/cert/path/test/CertPathTest.java index 3b8e23e0..d166d935 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/path/test/CertPathTest.java +++ b/pkix/src/test/java/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; @@ -31,9 +31,9 @@ import java.util.List; import java.util.Set; import java.util.Vector; -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 CertPathTest extends SimpleTest @@ -141,7 +141,7 @@ public class CertPathTest try { CertificateFactory cFac = CertificateFactory.getInstance("X.509", - "BC"); + "SC"); arr = os.toByteArray(); is = new ByteArrayInputStream(arr); cFac.generateCertPath(is); @@ -159,7 +159,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(((X509Certificate)certCol.get(0)).getSubjectX500Principal().getEncoded()); @@ -186,7 +186,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)); @@ -239,7 +239,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/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java b/pkix/src/test/java/org/spongycastle/cert/path/test/CertPathValidationTest.java index a99cb1c4..b168342c 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/path/test/CertPathValidationTest.java @@ -1,26 +1,26 @@ -package org.bouncycastle.cert.path.test; +package org.spongycastle.cert.path.test; import java.security.Security; import java.util.ArrayList; import java.util.List; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.cert.X509CRLHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509ContentVerifierProviderBuilder; -import org.bouncycastle.cert.jcajce.JcaX509ContentVerifierProviderBuilder; -import org.bouncycastle.cert.path.CertPath; -import org.bouncycastle.cert.path.CertPathValidation; -import org.bouncycastle.cert.path.CertPathValidationResult; -import org.bouncycastle.cert.path.validations.BasicConstraintsValidation; -import org.bouncycastle.cert.path.validations.CRLValidation; -import org.bouncycastle.cert.path.validations.KeyUsageValidation; -import org.bouncycastle.cert.path.validations.ParentCertIssuedValidation; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.cert.X509CRLHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509ContentVerifierProviderBuilder; +import org.spongycastle.cert.jcajce.JcaX509ContentVerifierProviderBuilder; +import org.spongycastle.cert.path.CertPath; +import org.spongycastle.cert.path.CertPathValidation; +import org.spongycastle.cert.path.CertPathValidationResult; +import org.spongycastle.cert.path.validations.BasicConstraintsValidation; +import org.spongycastle.cert.path.validations.CRLValidation; +import org.spongycastle.cert.path.validations.KeyUsageValidation; +import org.spongycastle.cert.path.validations.ParentCertIssuedValidation; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class CertPathValidationTest extends SimpleTest @@ -192,7 +192,7 @@ public class CertPathValidationTest // private void checkCircProcessing() // throws Exception // { -// CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC"); +// CertificateFactory cf = CertificateFactory.getInstance("X.509", "SC"); // // X509Certificate caCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCA)); // X509Certificate crlCaCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCRLCA)); @@ -214,12 +214,12 @@ public class CertPathValidationTest // List certchain = new ArrayList(); // // certchain.add(crlCaCert); -// 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(caCert, null)); // -// CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC"); +// CertPathValidator cpv = CertPathValidator.getInstance("PKIX","SC"); // //PKIXParameters param = new PKIXParameters(trust); // // PKIXBuilderParameters param = new PKIXBuilderParameters(trust, null); @@ -302,18 +302,18 @@ public class CertPathValidationTest // 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(2008,8,4,14,49,10); // //validating path // 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()); @@ -359,11 +359,11 @@ public class CertPathValidationTest // 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/pkix/src/test/java/org/bouncycastle/cert/test/AllTests.java b/pkix/src/test/java/org/spongycastle/cert/test/AllTests.java index ed0f6253..162abafb 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/AllTests.java +++ b/pkix/src/test/java/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/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java b/pkix/src/test/java/org/spongycastle/cert/test/AttrCertSelectorTest.java index 3fe3694d..99412f08 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/AttrCertSelectorTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.ByteArrayInputStream; import java.math.BigInteger; @@ -10,28 +10,28 @@ import java.security.cert.X509Certificate; import java.security.spec.RSAPrivateCrtKeySpec; import java.util.Date; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.Target; -import org.bouncycastle.asn1.x509.TargetInformation; -import org.bouncycastle.asn1.x509.X509Extension; -import org.bouncycastle.cert.AttributeCertificateHolder; -import org.bouncycastle.cert.AttributeCertificateIssuer; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; -import org.bouncycastle.util.test.Test; -import org.bouncycastle.util.test.TestResult; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.Target; +import org.spongycastle.asn1.x509.TargetInformation; +import org.spongycastle.asn1.x509.X509Extension; +import org.spongycastle.cert.AttributeCertificateHolder; +import org.spongycastle.cert.AttributeCertificateIssuer; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v2AttributeCertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; +import org.spongycastle.util.test.Test; +import org.spongycastle.util.test.TestResult; public class AttrCertSelectorTest extends SimpleTest @@ -102,7 +102,7 @@ public class AttrCertSelectorTest private X509AttributeCertificateHolder createAttrCert() throws Exception { - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509Certificate iCert = (X509Certificate) fact .generateCertificate(new ByteArrayInputStream(holderCert)); X509CertificateHolder iCertHolder = new JcaX509CertificateHolder(iCert); @@ -119,7 +119,7 @@ public class AttrCertSelectorTest // PrivateKey privKey; - KeyFactory kFact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory kFact = KeyFactory.getInstance("RSA", "SC"); privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC); @@ -188,7 +188,7 @@ public class AttrCertSelectorTest } sel.setIssuer(null); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509CertificateHolder iCert = new JcaX509CertificateHolder((X509Certificate) fact .generateCertificate(new ByteArrayInputStream(holderCert))); match = aCert.getHolder().match(iCert); diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/AttrCertTest.java b/pkix/src/test/java/org/spongycastle/cert/test/AttrCertTest.java index 4c32dedf..ea350426 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/AttrCertTest.java +++ b/pkix/src/test/java/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; @@ -19,30 +19,30 @@ import java.util.Set; import javax.security.auth.x500.X500Principal; -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.Extension; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -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.Extension; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +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 @@ -168,7 +168,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(); @@ -260,7 +260,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)); // @@ -276,7 +276,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); @@ -374,7 +374,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)); // @@ -390,7 +390,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); @@ -461,7 +461,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))) @@ -525,7 +525,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/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java b/pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertSelectorTest.java index 8be11c56..bf5557fd 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertSelectorTest.java @@ -1,30 +1,30 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.math.BigInteger; import java.util.Date; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.Target; -import org.bouncycastle.asn1.x509.TargetInformation; -import org.bouncycastle.cert.AttributeCertificateHolder; -import org.bouncycastle.cert.AttributeCertificateIssuer; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; -import org.bouncycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.Target; +import org.spongycastle.asn1.x509.TargetInformation; +import org.spongycastle.cert.AttributeCertificateHolder; +import org.spongycastle.cert.AttributeCertificateIssuer; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v2AttributeCertificateBuilder; +import org.spongycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.util.encoders.Base64; public class BcAttrCertSelectorTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/BcAttrCertTest.java b/pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertTest.java index 520920ad..6603e4d5 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/BcAttrCertTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/BcAttrCertTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.IOException; @@ -10,35 +10,35 @@ import java.util.List; import java.util.Set; import junit.framework.TestCase; -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.x500.style.RFC4519Style; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.Attribute; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.cert.AttributeCertificateHolder; -import org.bouncycastle.cert.AttributeCertificateIssuer; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v2AttributeCertificateBuilder; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.operator.ContentSigner; -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.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; +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.x500.style.RFC4519Style; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.Attribute; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.cert.AttributeCertificateHolder; +import org.spongycastle.cert.AttributeCertificateIssuer; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v2AttributeCertificateBuilder; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.RSAKeyParameters; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.operator.ContentSigner; +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.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; public class BcAttrCertTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java b/pkix/src/test/java/org/spongycastle/cert/test/BcCertTest.java index fd551381..41c98e8e 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/BcCertTest.java +++ b/pkix/src/test/java/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,61 +17,61 @@ 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.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.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 @@ -1264,7 +1264,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/java/org/bouncycastle/cert/test/BcPKCS10Test.java b/pkix/src/test/java/org/spongycastle/cert/test/BcPKCS10Test.java index 01a8dd5f..0d019764 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/BcPKCS10Test.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/BcPKCS10Test.java @@ -1,38 +1,38 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.math.BigInteger; import java.security.SecureRandom; import junit.framework.TestCase; -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.RFC4519Style; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.ExtensionsGenerator; -import org.bouncycastle.asn1.x509.KeyUsage; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.cert.bc.BcX509ExtensionUtils; -import org.bouncycastle.crypto.AsymmetricCipherKeyPair; -import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator; -import org.bouncycastle.crypto.generators.RSAKeyPairGenerator; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.params.RSAKeyGenerationParameters; -import org.bouncycastle.crypto.params.RSAKeyParameters; -import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.bc.BcContentSignerBuilder; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder; -import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; -import org.bouncycastle.pkcs.bc.BcPKCS10CertificationRequest; -import org.bouncycastle.pkcs.bc.BcPKCS10CertificationRequestBuilder; -import org.bouncycastle.util.Arrays; +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.RFC4519Style; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.BasicConstraints; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.ExtensionsGenerator; +import org.spongycastle.asn1.x509.KeyUsage; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.cert.bc.BcX509ExtensionUtils; +import org.spongycastle.crypto.AsymmetricCipherKeyPair; +import org.spongycastle.crypto.AsymmetricCipherKeyPairGenerator; +import org.spongycastle.crypto.generators.RSAKeyPairGenerator; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.params.RSAKeyGenerationParameters; +import org.spongycastle.crypto.params.RSAKeyParameters; +import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.bc.BcContentSignerBuilder; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.operator.bc.BcRSAContentVerifierProviderBuilder; +import org.spongycastle.pkcs.PKCS10CertificationRequest; +import org.spongycastle.pkcs.PKCS10CertificationRequestBuilder; +import org.spongycastle.pkcs.bc.BcPKCS10CertificationRequest; +import org.spongycastle.pkcs.bc.BcPKCS10CertificationRequestBuilder; +import org.spongycastle.util.Arrays; public class BcPKCS10Test extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java b/pkix/src/test/java/org/spongycastle/cert/test/CertTest.java index 30dec302..14e01304 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/CertTest.java +++ b/pkix/src/test/java/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; @@ -34,75 +34,75 @@ import java.util.Vector; import javax.security.auth.x500.X500Principal; -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.DERNull; -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.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.DERNull; +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.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); @@ -1461,7 +1461,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); @@ -2649,7 +2649,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); @@ -2666,11 +2666,11 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); - if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate))) + if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("SC").build(certificate))) { fail("CRL signature not valid"); } @@ -2684,7 +2684,7 @@ public class CertTest JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); @@ -2712,7 +2712,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); @@ -2737,11 +2737,11 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); - if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate))) + if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("SC").build(certificate))) { fail("CRL signature not valid"); } @@ -2755,7 +2755,7 @@ public class CertTest JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); @@ -2783,7 +2783,7 @@ public class CertTest private void testIndirect2() throws Exception { - KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC"); + KeyStore keyStore = KeyStore.getInstance("PKCS12", "SC"); ByteArrayInputStream input = new ByteArrayInputStream(testCAp12); @@ -2813,11 +2813,11 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); - if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate))) + if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("SC").build(certificate))) { fail("CRL signature not valid"); } @@ -2845,7 +2845,7 @@ public class CertTest JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); @@ -2869,7 +2869,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); @@ -2892,11 +2892,11 @@ public class CertTest JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption"); - contentSignerBuilder.setProvider("BC"); + contentSignerBuilder.setProvider("SC"); X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey)); - if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate))) + if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("SC").build(certificate))) { fail("CRL signature not valid"); } @@ -2910,7 +2910,7 @@ public class CertTest JcaX509CRLConverter converter = new JcaX509CRLConverter(); - converter.setProvider("BC"); + converter.setProvider("SC"); X509CRL crl = converter.getCRL(cRLHolder); diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/ConverterTest.java b/pkix/src/test/java/org/spongycastle/cert/test/ConverterTest.java index 6413b52b..0c2f88b8 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/ConverterTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/ConverterTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.math.BigInteger; import java.security.cert.X509CertSelector; @@ -6,12 +6,12 @@ import java.security.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/java/org/bouncycastle/cert/test/PEMData.java b/pkix/src/test/java/org/spongycastle/cert/test/PEMData.java index 6159f36f..fff7f943 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/PEMData.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/PEMData.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; public class PEMData { diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java b/pkix/src/test/java/org/spongycastle/cert/test/PKCS10Test.java index cd3e8af5..9bcada8c 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/PKCS10Test.java +++ b/pkix/src/test/java/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; @@ -14,41 +14,41 @@ import java.security.spec.RSAPublicKeySpec; import javax.security.auth.x500.X500Principal; -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.Extension; -import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.KeyUsage; -import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -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.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.Extension; +import org.spongycastle.asn1.x509.Extensions; +import org.spongycastle.asn1.x509.KeyUsage; +import org.spongycastle.asn1.x9.X9ObjectIdentifiers; +import org.spongycastle.cert.jcajce.JcaX509ExtensionUtils; +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.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; /** **/ @@ -105,7 +105,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); @@ -142,7 +142,7 @@ public class PKCS10Test private void generationTestX500Principal(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); @@ -188,7 +188,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); @@ -250,7 +250,7 @@ public class PKCS10Test fail("ECDSA parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -289,7 +289,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); @@ -351,7 +351,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()); @@ -385,7 +385,7 @@ public class PKCS10Test fail("ECGOST parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -414,7 +414,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); @@ -442,7 +442,7 @@ public class PKCS10Test fail("PSS parameters incorrect."); } - Signature sig = Signature.getInstance(algorithm, "BC"); + Signature sig = Signature.getInstance(algorithm, "SC"); sig.initVerify(pubKey); @@ -458,7 +458,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(); JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils(); @@ -520,9 +520,9 @@ public class PKCS10Test public void performTest() throws Exception { - generationTest(512, "RSA", "SHA1withRSA", "BC"); - generationTestX500Principal(512, "RSA", "SHA1withRSA", "BC"); - generationTest(512, "GOST3410", "GOST3411withGOST3410", "BC"); + generationTest(512, "RSA", "SHA1withRSA", "SC"); + generationTestX500Principal(512, "RSA", "SHA1withRSA", "SC"); + generationTest(512, "GOST3410", "GOST3411withGOST3410", "SC"); if (Security.getProvider("SunRsaSign") != null) { @@ -565,7 +565,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/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java b/pkix/src/test/java/org/spongycastle/cert/test/SHA1DigestCalculator.java index 4e8e7c19..61bfe6e6 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/SHA1DigestCalculator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.operator.DigestCalculator; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.operator.DigestCalculator; class SHA1DigestCalculator diff --git a/pkix/src/test/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java b/pkix/src/test/java/org/spongycastle/cert/test/X509ExtensionUtilsTest.java index cd06082e..0b073009 100644 --- a/pkix/src/test/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java +++ b/pkix/src/test/java/org/spongycastle/cert/test/X509ExtensionUtilsTest.java @@ -1,15 +1,15 @@ -package org.bouncycastle.cert.test; +package org.spongycastle.cert.test; import java.io.IOException; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.cert.X509ExtensionUtils; -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.ASN1Primitive; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.cert.X509ExtensionUtils; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.test.SimpleTest; public class X509ExtensionUtilsTest extends SimpleTest diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/AllTests.java b/pkix/src/test/java/org/spongycastle/cms/test/AllTests.java index 9cc2b0ec..7ef73a69 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import javax.crypto.Cipher; diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/BcEnvelopedDataTest.java index 366e9cb2..c7dd42f5 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/BcEnvelopedDataTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.IOException; import java.security.GeneralSecurityException; @@ -22,48 +22,48 @@ import javax.crypto.SecretKey; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.DERUTF8String; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.KeyTransRecipientInformation; -import org.bouncycastle.cms.PasswordRecipient; -import org.bouncycastle.cms.PasswordRecipientInformation; -import org.bouncycastle.cms.RecipientId; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SimpleAttributeTableGenerator; -import org.bouncycastle.cms.bc.BcCMSContentEncryptorBuilder; -import org.bouncycastle.cms.bc.BcKEKEnvelopedRecipient; -import org.bouncycastle.cms.bc.BcKEKRecipientInfoGenerator; -import org.bouncycastle.cms.bc.BcPasswordEnvelopedRecipient; -import org.bouncycastle.cms.bc.BcPasswordRecipientInfoGenerator; -import org.bouncycastle.cms.bc.BcRSAKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.crypto.util.PrivateKeyFactory; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.OutputEncryptor; -import org.bouncycastle.operator.bc.BcAESSymmetricKeyUnwrapper; -import org.bouncycastle.operator.bc.BcAESSymmetricKeyWrapper; -import org.bouncycastle.operator.bc.BcSymmetricKeyUnwrapper; -import org.bouncycastle.operator.bc.BcSymmetricKeyWrapper; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.DERUTF8String; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.nist.NISTObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PrivateKeyInfo; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSEnvelopedData; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.KeyTransRecipientInformation; +import org.spongycastle.cms.PasswordRecipient; +import org.spongycastle.cms.PasswordRecipientInformation; +import org.spongycastle.cms.RecipientId; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SimpleAttributeTableGenerator; +import org.spongycastle.cms.bc.BcCMSContentEncryptorBuilder; +import org.spongycastle.cms.bc.BcKEKEnvelopedRecipient; +import org.spongycastle.cms.bc.BcKEKRecipientInfoGenerator; +import org.spongycastle.cms.bc.BcPasswordEnvelopedRecipient; +import org.spongycastle.cms.bc.BcPasswordRecipientInfoGenerator; +import org.spongycastle.cms.bc.BcRSAKeyTransEnvelopedRecipient; +import org.spongycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientId; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; +import org.spongycastle.crypto.params.KeyParameter; +import org.spongycastle.crypto.util.PrivateKeyFactory; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.OutputEncryptor; +import org.spongycastle.operator.bc.BcAESSymmetricKeyUnwrapper; +import org.spongycastle.operator.bc.BcAESSymmetricKeyWrapper; +import org.spongycastle.operator.bc.BcSymmetricKeyUnwrapper; +import org.spongycastle.operator.bc.BcSymmetricKeyWrapper; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; public class BcEnvelopedDataTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/BcSignedDataTest.java index 1c4ccc0e..e2782ba6 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/BcSignedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/BcSignedDataTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,61 +20,61 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.cms.CMSAttributes; -import org.bouncycastle.asn1.cms.ContentInfo; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaCRLStore; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509CRLHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cms.CMSAbsentContent; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSTypedData; -import org.bouncycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator; -import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator; -import org.bouncycastle.cms.SignerId; -import org.bouncycastle.cms.SignerInfoGeneratorBuilder; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.bc.BcRSASignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.util.PrivateKeyFactory; -import org.bouncycastle.jcajce.provider.config.ConfigurableProvider; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.BufferingContentSigner; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcContentSignerBuilder; -import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.cms.CMSAttributes; +import org.spongycastle.asn1.cms.ContentInfo; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaCRLStore; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cert.jcajce.JcaX509CRLHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cms.CMSAbsentContent; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSTypedData; +import org.spongycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator; +import org.spongycastle.cms.DefaultSignedAttributeTableGenerator; +import org.spongycastle.cms.SignerId; +import org.spongycastle.cms.SignerInfoGeneratorBuilder; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.bc.BcRSASignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.util.PrivateKeyFactory; +import org.spongycastle.jcajce.provider.config.ConfigurableProvider; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.BufferingContentSigner; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.bc.BcContentSignerBuilder; +import org.spongycastle.operator.bc.BcDigestCalculatorProvider; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.io.Streams; public class BcSignedDataTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/CMSSampleMessages.java b/pkix/src/test/java/org/spongycastle/cms/test/CMSSampleMessages.java index 20ae6ca5..a9609df7 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/CMSSampleMessages.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/CMSSampleMessages.java @@ -1,6 +1,6 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Base64; public class CMSSampleMessages { diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/CMSTestSetup.java b/pkix/src/test/java/org/spongycastle/cms/test/CMSTestSetup.java index 5fca6180..644d3d3b 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/CMSTestSetup.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/CMSTestSetup.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import junit.extensions.TestSetup; import junit.framework.Test; @@ -14,11 +14,11 @@ class CMSTestSetup extends TestSetup protected void setUp() { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } protected void tearDown() { - Security.removeProvider("BC"); + Security.removeProvider("SC"); } } diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/CMSTestUtil.java b/pkix/src/test/java/org/spongycastle/cms/test/CMSTestUtil.java index 3a1517af..90c42e74 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/CMSTestUtil.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/CMSTestUtil.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -19,33 +19,33 @@ import java.util.Date; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.RSAESOAEPparams; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.CRLReason; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509ExtensionUtils; -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.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; -import org.bouncycastle.jce.ECGOST3410NamedCurveTable; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.GOST3410ParameterSpec; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.RSAESOAEPparams; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.AuthorityKeyIdentifier; +import org.spongycastle.asn1.x509.BasicConstraints; +import org.spongycastle.asn1.x509.CRLReason; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509ExtensionUtils; +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.JcaX509CertificateConverter; +import org.spongycastle.cert.jcajce.JcaX509ExtensionUtils; +import org.spongycastle.cert.jcajce.JcaX509v1CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder; +import org.spongycastle.jce.ECGOST3410NamedCurveTable; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.GOST3410ParameterSpec; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.util.encoders.Base64; public class CMSTestUtil { @@ -118,18 +118,18 @@ public class CMSTestUtil rand = new SecureRandom(); - kpg = KeyPairGenerator.getInstance("RSA", "BC"); + kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024, rand); - kpg = KeyPairGenerator.getInstance("RSA", "BC"); + kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024, rand); - gostKpg = KeyPairGenerator.getInstance("GOST3410", "BC"); + gostKpg = KeyPairGenerator.getInstance("GOST3410", "SC"); GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A.getId()); gostKpg.initialize(gost3410P, new SecureRandom()); - dsaKpg = KeyPairGenerator.getInstance("DSA", "BC"); + dsaKpg = KeyPairGenerator.getInstance("DSA", "SC"); DSAParameterSpec dsaSpec = new DSAParameterSpec( new BigInteger("7434410770759874867539421675728577177024889699586189000788950934679315164676852047058354758883833299702695428196962057871264685291775577130504050839126673"), new BigInteger("1138656671590261728308283492178581223478058193247"), @@ -137,35 +137,35 @@ public class CMSTestUtil dsaKpg.initialize(dsaSpec, new SecureRandom()); - ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "BC"); + ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "SC"); ecGostKpg.initialize(ECGOST3410NamedCurveTable.getParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom()); - ecDsaKpg = KeyPairGenerator.getInstance("ECDSA", "BC"); + ecDsaKpg = KeyPairGenerator.getInstance("ECDSA", "SC"); ecDsaKpg.initialize(239, new SecureRandom()); - aes192kg = KeyGenerator.getInstance("AES", "BC"); + aes192kg = KeyGenerator.getInstance("AES", "SC"); aes192kg.init(192, rand); - desede128kg = KeyGenerator.getInstance("DESEDE", "BC"); + desede128kg = KeyGenerator.getInstance("DESEDE", "SC"); desede128kg.init(112, rand); - desede192kg = KeyGenerator.getInstance("DESEDE", "BC"); + desede192kg = KeyGenerator.getInstance("DESEDE", "SC"); desede192kg.init(168, rand); - rc240kg = KeyGenerator.getInstance("RC2", "BC"); + rc240kg = KeyGenerator.getInstance("RC2", "SC"); rc240kg.init(40, rand); - rc264kg = KeyGenerator.getInstance("RC2", "BC"); + rc264kg = KeyGenerator.getInstance("RC2", "SC"); rc264kg.init(64, rand); - rc2128kg = KeyGenerator.getInstance("RC2", "BC"); + rc2128kg = KeyGenerator.getInstance("RC2", "SC"); rc2128kg.init(128, rand); - aesKg = KeyGenerator.getInstance("AES", "BC"); + aesKg = KeyGenerator.getInstance("AES", "SC"); - seedKg = KeyGenerator.getInstance("SEED", "BC"); + seedKg = KeyGenerator.getInstance("SEED", "SC"); - camelliaKg = KeyGenerator.getInstance("Camellia", "BC"); + camelliaKg = KeyGenerator.getInstance("Camellia", "SC"); serialNumber = new BigInteger("1"); } @@ -315,7 +315,7 @@ public class CMSTestUtil JcaContentSignerBuilder contentSignerBuilder = makeContentSignerBuilder(issPub); - X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v1CertGen.build(contentSignerBuilder.build(issPriv))); + X509Certificate _cert = new JcaX509CertificateConverter().setProvider("SC").getCertificate(v1CertGen.build(contentSignerBuilder.build(issPriv))); _cert.checkValidity(new Date()); _cert.verify(issPub); @@ -356,7 +356,7 @@ public class CMSTestUtil false, new BasicConstraints(_ca)); - X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv))); + X509Certificate _cert = new JcaX509CertificateConverter().setProvider("SC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv))); _cert.checkValidity(new Date()); _cert.verify(issPub); @@ -397,7 +397,7 @@ public class CMSTestUtil false, new BasicConstraints(_ca)); - X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv))); + X509Certificate _cert = new JcaX509CertificateConverter().setProvider("SC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv))); _cert.checkValidity(new Date()); _cert.verify(issPub); @@ -447,7 +447,7 @@ public class CMSTestUtil crlGen.addExtension(Extension.authorityKeyIdentifier, false, extensionUtils.createAuthorityKeyIdentifier(pair.getPublic())); - return new JcaX509CRLConverter().setProvider("BC").getCRL(crlGen.build(new JcaContentSignerBuilder("SHA256WithRSAEncryption").setProvider("BC").build(pair.getPrivate()))); + return new JcaX509CRLConverter().setProvider("SC").getCRL(crlGen.build(new JcaContentSignerBuilder("SHA256WithRSAEncryption").setProvider("SC").build(pair.getPrivate()))); } /* diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/ConverterTest.java b/pkix/src/test/java/org/spongycastle/cms/test/ConverterTest.java index 534d0dd8..cf08054d 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/ConverterTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/ConverterTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.math.BigInteger; import java.security.cert.X509CertSelector; @@ -6,13 +6,13 @@ import java.security.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/java/org/bouncycastle/cms/test/MiscDataStreamTest.java b/pkix/src/test/java/org/spongycastle/cms/test/MiscDataStreamTest.java index bc633dd4..d01b68e3 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/MiscDataStreamTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/MiscDataStreamTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -16,27 +16,27 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaCRLStore; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cms.CMSCompressedDataStreamGenerator; -import org.bouncycastle.cms.CMSDigestedData; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSSignedDataStreamGenerator; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.cms.jcajce.ZlibCompressor; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaCRLStore; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cms.CMSCompressedDataStreamGenerator; +import org.spongycastle.cms.CMSDigestedData; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSSignedDataStreamGenerator; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.cms.jcajce.ZlibCompressor; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; public class MiscDataStreamTest extends TestCase @@ -107,7 +107,7 @@ public class MiscDataStreamTest if (!_initialised) { _initialised = true; - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); _signDN = "O=Bouncy Castle, C=AU"; _signKP = CMSTestUtil.makeKeyPair(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataStreamTest.java index b260bcbc..589c64e4 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataStreamTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; @@ -12,23 +12,23 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSAuthenticatedDataParser; -import org.bouncycastle.cms.CMSAuthenticatedDataStreamGenerator; -import org.bouncycastle.cms.OriginatorInfoGenerator; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.jcajce.JceCMSMacCalculatorBuilder; -import org.bouncycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSAuthenticatedDataParser; +import org.spongycastle.cms.CMSAuthenticatedDataStreamGenerator; +import org.spongycastle.cms.OriginatorInfoGenerator; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.jcajce.JceCMSMacCalculatorBuilder; +import org.spongycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; public class NewAuthenticatedDataStreamTest extends TestCase @@ -61,7 +61,7 @@ public class NewAuthenticatedDataStreamTest if (!_initialised) { _initialised = true; - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); _signDN = "O=Bouncy Castle, C=AU"; _signKP = CMSTestUtil.makeKeyPair(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataTest.java index 8d788b58..326748fe 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewAuthenticatedDataTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.security.KeyPair; import java.security.NoSuchAlgorithmException; @@ -14,35 +14,35 @@ import javax.crypto.SecretKey; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSAuthenticatedData; -import org.bouncycastle.cms.CMSAuthenticatedDataGenerator; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.OriginatorInfoGenerator; -import org.bouncycastle.cms.PasswordRecipient; -import org.bouncycastle.cms.PasswordRecipientInformation; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.jcajce.JceCMSMacCalculatorBuilder; -import org.bouncycastle.cms.jcajce.JceKEKAuthenticatedRecipient; -import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyAgreeAuthenticatedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JcePasswordAuthenticatedRecipient; -import org.bouncycastle.cms.jcajce.JcePasswordRecipientInfoGenerator; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSAuthenticatedData; +import org.spongycastle.cms.CMSAuthenticatedDataGenerator; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.OriginatorInfoGenerator; +import org.spongycastle.cms.PasswordRecipient; +import org.spongycastle.cms.PasswordRecipientInformation; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.jcajce.JceCMSMacCalculatorBuilder; +import org.spongycastle.cms.jcajce.JceKEKAuthenticatedRecipient; +import org.spongycastle.cms.jcajce.JceKEKRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyAgreeAuthenticatedRecipient; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JcePasswordAuthenticatedRecipient; +import org.spongycastle.cms.jcajce.JcePasswordRecipientInfoGenerator; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.encoders.Hex; public class NewAuthenticatedDataTest extends TestCase @@ -75,7 +75,7 @@ public class NewAuthenticatedDataTest if (!_initialised) { _initialised = true; - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); _signDN = "O=Bouncy Castle, C=AU"; _signKP = CMSTestUtil.makeKeyPair(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataStreamTest.java index 3acc15db..f2edfbe9 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataStreamTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; @@ -8,11 +8,11 @@ import java.util.Random; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.cms.CMSCompressedDataParser; -import org.bouncycastle.cms.CMSCompressedDataStreamGenerator; -import org.bouncycastle.cms.jcajce.ZlibCompressor; -import org.bouncycastle.cms.jcajce.ZlibExpanderProvider; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.cms.CMSCompressedDataParser; +import org.spongycastle.cms.CMSCompressedDataStreamGenerator; +import org.spongycastle.cms.jcajce.ZlibCompressor; +import org.spongycastle.cms.jcajce.ZlibExpanderProvider; +import org.spongycastle.util.encoders.Base64; public class NewCompressedDataStreamTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataTest.java index 9c888ce6..13600e72 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewCompressedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewCompressedDataTest.java @@ -1,18 +1,18 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.util.Arrays; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.cms.CMSCompressedData; -import org.bouncycastle.cms.CMSCompressedDataGenerator; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.jcajce.ZlibCompressor; -import org.bouncycastle.cms.jcajce.ZlibExpanderProvider; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.io.StreamOverflowException; +import org.spongycastle.cms.CMSCompressedData; +import org.spongycastle.cms.CMSCompressedDataGenerator; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.jcajce.ZlibCompressor; +import org.spongycastle.cms.jcajce.ZlibExpanderProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.io.StreamOverflowException; public class NewCompressedDataTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataStreamTest.java index 77596779..3a86a67a 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataStreamTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -20,38 +20,38 @@ import javax.crypto.SecretKey; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.DEROutputStream; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.DERUTF8String; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSEnvelopedDataParser; -import org.bouncycastle.cms.CMSEnvelopedDataStreamGenerator; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.KEKRecipientId; -import org.bouncycastle.cms.OriginatorInfoGenerator; -import org.bouncycastle.cms.OriginatorInformation; -import org.bouncycastle.cms.RecipientId; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SimpleAttributeTableGenerator; -import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; -import org.bouncycastle.cms.jcajce.JceKEKEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.DEROutputStream; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.DERUTF8String; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSEnvelopedDataParser; +import org.spongycastle.cms.CMSEnvelopedDataStreamGenerator; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.KEKRecipientId; +import org.spongycastle.cms.OriginatorInfoGenerator; +import org.spongycastle.cms.OriginatorInformation; +import org.spongycastle.cms.RecipientId; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SimpleAttributeTableGenerator; +import org.spongycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.spongycastle.cms.jcajce.JceKEKEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKEKRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientId; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; public class NewEnvelopedDataStreamTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataTest.java index da3641cb..f68ed383 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewEnvelopedDataTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.IOException; import java.security.*; @@ -19,57 +19,57 @@ import javax.crypto.spec.SecretKeySpec; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.DERUTF8String; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.RC2CBCParameter; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.KeyTransRecipientInformation; -import org.bouncycastle.cms.OriginatorInfoGenerator; -import org.bouncycastle.cms.OriginatorInformation; -import org.bouncycastle.cms.PasswordRecipient; -import org.bouncycastle.cms.PasswordRecipientInformation; -import org.bouncycastle.cms.RecipientId; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SimpleAttributeTableGenerator; -import org.bouncycastle.cms.bc.BcCMSContentEncryptorBuilder; -import org.bouncycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; -import org.bouncycastle.cms.jcajce.JceKEKEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId; -import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientId; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.cms.jcajce.JcePasswordEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JcePasswordRecipientInfoGenerator; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.OutputEncryptor; -import org.bouncycastle.operator.jcajce.JcaAlgorithmParametersConverter; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.DERUTF8String; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.kisa.KISAObjectIdentifiers; +import org.spongycastle.asn1.nist.NISTObjectIdentifiers; +import org.spongycastle.asn1.ntt.NTTObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.RC2CBCParameter; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSEnvelopedData; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.KeyTransRecipientInformation; +import org.spongycastle.cms.OriginatorInfoGenerator; +import org.spongycastle.cms.OriginatorInformation; +import org.spongycastle.cms.PasswordRecipient; +import org.spongycastle.cms.PasswordRecipientInformation; +import org.spongycastle.cms.RecipientId; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SimpleAttributeTableGenerator; +import org.spongycastle.cms.bc.BcCMSContentEncryptorBuilder; +import org.spongycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.spongycastle.cms.jcajce.JceKEKEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKEKRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientId; +import org.spongycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientId; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.cms.jcajce.JcePasswordEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JcePasswordRecipientInfoGenerator; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.OutputEncryptor; +import org.spongycastle.operator.jcajce.JcaAlgorithmParametersConverter; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; public class NewEnvelopedDataTest extends TestCase @@ -222,7 +222,7 @@ public class NewEnvelopedDataTest if (!_initialised) { _initialised = true; - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); _signDN = "O=Bouncy Castle, C=AU"; _signKP = CMSTestUtil.makeKeyPair(); diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataStreamTest.java index 8a92caeb..8032b71c 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataStreamTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; @@ -20,44 +20,44 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.cms.CMSAttributes; -import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; -import org.bouncycastle.asn1.ocsp.OCSPResponse; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaCRLStore; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509CRLHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSAttributeTableGenerator; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSSignedDataStreamGenerator; -import org.bouncycastle.cms.CMSTypedData; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.cms.CMSAttributes; +import org.spongycastle.asn1.cms.CMSObjectIdentifiers; +import org.spongycastle.asn1.ocsp.OCSPResponse; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaCRLStore; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cert.jcajce.JcaX509CRLHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cert.ocsp.OCSPResp; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSAttributeTableGenerator; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSSignedDataStreamGenerator; +import org.spongycastle.cms.CMSTypedData; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.DefaultSignedAttributeTableGenerator; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; public class NewSignedDataStreamTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataTest.java index 7df2c130..54152ea7 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NewSignedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NewSignedDataTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,64 +20,64 @@ import java.util.Map; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1OctetString; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.DERSet; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.cms.CMSAttributes; -import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; -import org.bouncycastle.asn1.cms.ContentInfo; -import org.bouncycastle.asn1.ocsp.OCSPResponse; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cert.X509AttributeCertificateHolder; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaCRLStore; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509CRLHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cms.CMSAbsentContent; -import org.bouncycastle.cms.CMSAlgorithm; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSTypedData; -import org.bouncycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator; -import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator; -import org.bouncycastle.cms.SignerId; -import org.bouncycastle.cms.SignerInfoGeneratorBuilder; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.SignerInformationVerifier; -import org.bouncycastle.cms.SignerInformationVerifierProvider; -import org.bouncycastle.cms.bc.BcRSASignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaSignerId; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.crypto.params.AsymmetricKeyParameter; -import org.bouncycastle.crypto.util.PrivateKeyFactory; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.bc.BcContentSignerBuilder; -import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1OctetString; +import org.spongycastle.asn1.DEROctetString; +import org.spongycastle.asn1.DERSet; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.cms.CMSAttributes; +import org.spongycastle.asn1.cms.CMSObjectIdentifiers; +import org.spongycastle.asn1.cms.ContentInfo; +import org.spongycastle.asn1.ocsp.OCSPResponse; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.cert.X509AttributeCertificateHolder; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaCRLStore; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cert.jcajce.JcaX509CRLHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cert.ocsp.OCSPResp; +import org.spongycastle.cms.CMSAbsentContent; +import org.spongycastle.cms.CMSAlgorithm; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSTypedData; +import org.spongycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator; +import org.spongycastle.cms.DefaultSignedAttributeTableGenerator; +import org.spongycastle.cms.SignerId; +import org.spongycastle.cms.SignerInfoGeneratorBuilder; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.SignerInformationVerifier; +import org.spongycastle.cms.SignerInformationVerifierProvider; +import org.spongycastle.cms.bc.BcRSASignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaSignerId; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.crypto.params.AsymmetricKeyParameter; +import org.spongycastle.crypto.util.PrivateKeyFactory; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.DefaultDigestAlgorithmIdentifierFinder; +import org.spongycastle.operator.DefaultSignatureAlgorithmIdentifierFinder; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.bc.BcContentSignerBuilder; +import org.spongycastle.operator.bc.BcDigestCalculatorProvider; +import org.spongycastle.operator.bc.BcRSAContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.io.Streams; public class NewSignedDataTest extends TestCase @@ -537,7 +537,7 @@ public class NewSignedDataTest if (Security.getProvider(BC) == null) { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } _origDN = "O=Bouncy Castle, C=AU"; @@ -1188,7 +1188,7 @@ public class NewSignedDataTest Iterator certIt = certCollection.iterator(); X509CertificateHolder cert = (X509CertificateHolder)certIt.next(); - assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert))); + assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert))); } } diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java b/pkix/src/test/java/org/spongycastle/cms/test/NullProviderTest.java index a97b21c6..640f3f59 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/NullProviderTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/NullProviderTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,37 +25,37 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.cms.ContentInfo; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSSignedDataStreamGenerator; -import org.bouncycastle.cms.CMSTypedData; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.cms.ContentInfo; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cms.CMSEnvelopedData; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSSignedDataStreamGenerator; +import org.spongycastle.cms.CMSTypedData; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.x509.X509V3CertificateGenerator; public class NullProviderTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java b/pkix/src/test/java/org/spongycastle/cms/test/Rfc4134Test.java index 2f597024..ab321027 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/Rfc4134Test.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/Rfc4134Test.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -24,38 +24,38 @@ import java.util.Iterator; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1EncodableVector; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.DERUTF8String; -import org.bouncycastle.asn1.cms.Attribute; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.cms.CMSAttributes; -import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSEnvelopedDataParser; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Hex; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.ASN1EncodableVector; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.DERUTF8String; +import org.spongycastle.asn1.cms.Attribute; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.cms.CMSAttributes; +import org.spongycastle.asn1.cms.CMSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cms.CMSEnvelopedData; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSEnvelopedDataParser; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Hex; +import org.spongycastle.util.io.Streams; public class Rfc4134Test extends TestCase @@ -387,7 +387,7 @@ public class Rfc4134Test private void verifySigner(SignerInformation signer, X509CertificateHolder certHolder) throws Exception { - X509Certificate cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(certHolder); + X509Certificate cert = new JcaX509CertificateConverter().setProvider("SC").getCertificate(certHolder); if (cert.getPublicKey() instanceof DSAPublicKey) { DSAPublicKey key = (DSAPublicKey)cert.getPublicKey(); diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java b/pkix/src/test/java/org/spongycastle/cms/test/SHA1DigestCalculator.java index 8bbd4ade..f3d5fd72 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/SHA1DigestCalculator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.cms.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.operator.DigestCalculator; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.operator.DigestCalculator; class SHA1DigestCalculator diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java b/pkix/src/test/java/org/spongycastle/cms/test/SunProviderTest.java index 3ec8c5ae..a92417c2 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/SunProviderTest.java +++ b/pkix/src/test/java/org/spongycastle/cms/test/SunProviderTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.cms.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -25,39 +25,39 @@ import java.util.List; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.cms.ContentInfo; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cms.CMSEnvelopedData; -import org.bouncycastle.cms.CMSEnvelopedDataGenerator; -import org.bouncycastle.cms.CMSProcessableByteArray; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.CMSSignedDataParser; -import org.bouncycastle.cms.CMSSignedDataStreamGenerator; -import org.bouncycastle.cms.CMSTypedData; -import org.bouncycastle.cms.CMSTypedStream; -import org.bouncycastle.cms.RecipientInformation; -import org.bouncycastle.cms.RecipientInformationStore; -import org.bouncycastle.cms.SignerInformation; -import org.bouncycastle.cms.SignerInformationStore; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; -import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder; -import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; -import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.CollectionStore; -import org.bouncycastle.util.Store; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.cms.ContentInfo; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cms.CMSEnvelopedData; +import org.spongycastle.cms.CMSEnvelopedDataGenerator; +import org.spongycastle.cms.CMSProcessableByteArray; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.CMSSignedDataParser; +import org.spongycastle.cms.CMSSignedDataStreamGenerator; +import org.spongycastle.cms.CMSTypedData; +import org.spongycastle.cms.CMSTypedStream; +import org.spongycastle.cms.RecipientInformation; +import org.spongycastle.cms.RecipientInformationStore; +import org.spongycastle.cms.SignerInformation; +import org.spongycastle.cms.SignerInformationStore; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.cms.jcajce.JcaX509CertSelectorConverter; +import org.spongycastle.cms.jcajce.JceCMSContentEncryptorBuilder; +import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient; +import org.spongycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.CollectionStore; +import org.spongycastle.util.Store; +import org.spongycastle.x509.X509V3CertificateGenerator; public class SunProviderTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/dvcs/test/AllTests.java b/pkix/src/test/java/org/spongycastle/dvcs/test/AllTests.java index 3cfeefea..b00a5052 100644 --- a/pkix/src/test/java/org/bouncycastle/dvcs/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/dvcs/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.dvcs.test; +package org.spongycastle.dvcs.test; import java.io.IOException; import java.security.KeyPair; @@ -9,38 +9,38 @@ import java.security.cert.X509Certificate; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.dvcs.CertEtcToken; -import org.bouncycastle.asn1.dvcs.TargetEtcChain; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.cms.CMSSignedDataGenerator; -import org.bouncycastle.cms.SignerId; -import org.bouncycastle.cms.SignerInformationVerifier; -import org.bouncycastle.cms.SignerInformationVerifierProvider; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.cms.test.CMSTestUtil; -import org.bouncycastle.dvcs.CCPDRequestBuilder; -import org.bouncycastle.dvcs.CCPDRequestData; -import org.bouncycastle.dvcs.CPDRequestBuilder; -import org.bouncycastle.dvcs.CPDRequestData; -import org.bouncycastle.dvcs.DVCSException; -import org.bouncycastle.dvcs.DVCSRequest; -import org.bouncycastle.dvcs.MessageImprint; -import org.bouncycastle.dvcs.MessageImprintBuilder; -import org.bouncycastle.dvcs.SignedDVCSMessageGenerator; -import org.bouncycastle.dvcs.TargetChain; -import org.bouncycastle.dvcs.VPKCRequestBuilder; -import org.bouncycastle.dvcs.VPKCRequestData; -import org.bouncycastle.dvcs.VSDRequestBuilder; -import org.bouncycastle.dvcs.VSDRequestData; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.ContentSigner; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.dvcs.CertEtcToken; +import org.spongycastle.asn1.dvcs.TargetEtcChain; +import org.spongycastle.cert.jcajce.JcaX509CertificateHolder; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.cms.CMSSignedDataGenerator; +import org.spongycastle.cms.SignerId; +import org.spongycastle.cms.SignerInformationVerifier; +import org.spongycastle.cms.SignerInformationVerifierProvider; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.cms.test.CMSTestUtil; +import org.spongycastle.dvcs.CCPDRequestBuilder; +import org.spongycastle.dvcs.CCPDRequestData; +import org.spongycastle.dvcs.CPDRequestBuilder; +import org.spongycastle.dvcs.CPDRequestData; +import org.spongycastle.dvcs.DVCSException; +import org.spongycastle.dvcs.DVCSRequest; +import org.spongycastle.dvcs.MessageImprint; +import org.spongycastle.dvcs.MessageImprintBuilder; +import org.spongycastle.dvcs.SignedDVCSMessageGenerator; +import org.spongycastle.dvcs.TargetChain; +import org.spongycastle.dvcs.VPKCRequestBuilder; +import org.spongycastle.dvcs.VPKCRequestData; +import org.spongycastle.dvcs.VSDRequestBuilder; +import org.spongycastle.dvcs.VSDRequestData; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.ContentSigner; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.io.Streams; public class AllTests extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java b/pkix/src/test/java/org/spongycastle/dvcs/test/DVCSParseTest.java index 90a46b4e..3fe82bc4 100644 --- a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSParseTest.java +++ b/pkix/src/test/java/org/spongycastle/dvcs/test/DVCSParseTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.dvcs.test; +package org.spongycastle.dvcs.test; import java.io.IOException; import java.math.BigInteger; @@ -7,35 +7,35 @@ import java.util.Iterator; import java.util.List; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1GeneralizedTime; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.cmp.PKIStatus; -import org.bouncycastle.asn1.cmp.PKIStatusInfo; -import org.bouncycastle.asn1.dvcs.CertEtcToken; -import org.bouncycastle.asn1.dvcs.DVCSCertInfo; -import org.bouncycastle.asn1.dvcs.DVCSCertInfoBuilder; -import org.bouncycastle.asn1.dvcs.DVCSErrorNotice; -import org.bouncycastle.asn1.dvcs.DVCSRequest; -import org.bouncycastle.asn1.dvcs.DVCSRequestInformation; -import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder; -import org.bouncycastle.asn1.dvcs.DVCSResponse; -import org.bouncycastle.asn1.dvcs.DVCSTime; -import org.bouncycastle.asn1.dvcs.Data; -import org.bouncycastle.asn1.dvcs.ServiceType; -import org.bouncycastle.asn1.dvcs.TargetEtcChain; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.asn1.x509.Certificate; -import org.bouncycastle.asn1.x509.DigestInfo; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.PolicyInformation; -import org.bouncycastle.cms.CMSException; -import org.bouncycastle.cms.CMSSignedData; -import org.bouncycastle.dvcs.DVCSException; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1GeneralizedTime; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.ASN1Sequence; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.cmp.PKIStatus; +import org.spongycastle.asn1.cmp.PKIStatusInfo; +import org.spongycastle.asn1.dvcs.CertEtcToken; +import org.spongycastle.asn1.dvcs.DVCSCertInfo; +import org.spongycastle.asn1.dvcs.DVCSCertInfoBuilder; +import org.spongycastle.asn1.dvcs.DVCSErrorNotice; +import org.spongycastle.asn1.dvcs.DVCSRequest; +import org.spongycastle.asn1.dvcs.DVCSRequestInformation; +import org.spongycastle.asn1.dvcs.DVCSRequestInformationBuilder; +import org.spongycastle.asn1.dvcs.DVCSResponse; +import org.spongycastle.asn1.dvcs.DVCSTime; +import org.spongycastle.asn1.dvcs.Data; +import org.spongycastle.asn1.dvcs.ServiceType; +import org.spongycastle.asn1.dvcs.TargetEtcChain; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.asn1.x509.Certificate; +import org.spongycastle.asn1.x509.DigestInfo; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.PolicyInformation; +import org.spongycastle.cms.CMSException; +import org.spongycastle.cms.CMSSignedData; +import org.spongycastle.dvcs.DVCSException; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.encoders.Hex; public class DVCSParseTest extends TestCase @@ -211,7 +211,7 @@ public class DVCSParseTest { byte[] requestBytes = Base64.decode(base64request); - org.bouncycastle.dvcs.DVCSRequest request = new org.bouncycastle.dvcs.DVCSRequest(new CMSSignedData(requestBytes)); + org.spongycastle.dvcs.DVCSRequest request = new org.spongycastle.dvcs.DVCSRequest(new CMSSignedData(requestBytes)); validate(name, request.getContent(), expected); } @@ -234,7 +234,7 @@ public class DVCSParseTest throws DVCSException, IOException, CMSException { byte[] responseBytes = Base64.decode(base64response); - org.bouncycastle.dvcs.DVCSResponse response = new org.bouncycastle.dvcs.DVCSResponse(new CMSSignedData(responseBytes)); + org.spongycastle.dvcs.DVCSResponse response = new org.spongycastle.dvcs.DVCSResponse(new CMSSignedData(responseBytes)); validate(name, response.getContent(), expected); } diff --git a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java b/pkix/src/test/java/org/spongycastle/dvcs/test/DVCSTestSetup.java index 3d86191e..012738af 100644 --- a/pkix/src/test/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java +++ b/pkix/src/test/java/org/spongycastle/dvcs/test/DVCSTestSetup.java @@ -1,11 +1,11 @@ -package org.bouncycastle.dvcs.test; +package org.spongycastle.dvcs.test; import java.security.Security; import junit.extensions.TestSetup; import junit.framework.Test; -import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.provider.BouncyCastleProvider; class DVCSTestSetup extends TestSetup diff --git a/pkix/src/test/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java b/pkix/src/test/java/org/spongycastle/dvcs/test/SHA1DigestCalculator.java index 82f30164..82874696 100644 --- a/pkix/src/test/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java +++ b/pkix/src/test/java/org/spongycastle/dvcs/test/SHA1DigestCalculator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.dvcs.test; +package org.spongycastle.dvcs.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.operator.DigestCalculator; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.operator.DigestCalculator; class SHA1DigestCalculator diff --git a/pkix/src/test/java/org/bouncycastle/eac/test/AllTests.java b/pkix/src/test/java/org/spongycastle/eac/test/AllTests.java index f8198556..9ca3f2cc 100644 --- a/pkix/src/test/java/org/bouncycastle/eac/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/eac/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.eac.test; +package org.spongycastle.eac.test; import java.io.IOException; import java.security.InvalidAlgorithmParameterException; @@ -13,23 +13,23 @@ import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.eac.CertificateHolderAuthorization; -import org.bouncycastle.asn1.eac.CertificateHolderReference; -import org.bouncycastle.asn1.eac.CertificationAuthorityReference; -import org.bouncycastle.asn1.eac.EACObjectIdentifiers; -import org.bouncycastle.asn1.eac.PackedDate; -import org.bouncycastle.eac.EACCertificateBuilder; -import org.bouncycastle.eac.EACCertificateHolder; -import org.bouncycastle.eac.EACCertificateRequestHolder; -import org.bouncycastle.eac.jcajce.JcaPublicKeyConverter; -import org.bouncycastle.eac.operator.EACSignatureVerifier; -import org.bouncycastle.eac.operator.EACSigner; -import org.bouncycastle.eac.operator.jcajce.JcaEACSignatureVerifierBuilder; -import org.bouncycastle.eac.operator.jcajce.JcaEACSignerBuilder; -import org.bouncycastle.jce.ECNamedCurveTable; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.jce.spec.ECParameterSpec; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.eac.CertificateHolderAuthorization; +import org.spongycastle.asn1.eac.CertificateHolderReference; +import org.spongycastle.asn1.eac.CertificationAuthorityReference; +import org.spongycastle.asn1.eac.EACObjectIdentifiers; +import org.spongycastle.asn1.eac.PackedDate; +import org.spongycastle.eac.EACCertificateBuilder; +import org.spongycastle.eac.EACCertificateHolder; +import org.spongycastle.eac.EACCertificateRequestHolder; +import org.spongycastle.eac.jcajce.JcaPublicKeyConverter; +import org.spongycastle.eac.operator.EACSignatureVerifier; +import org.spongycastle.eac.operator.EACSigner; +import org.spongycastle.eac.operator.jcajce.JcaEACSignatureVerifierBuilder; +import org.spongycastle.eac.operator.jcajce.JcaEACSignerBuilder; +import org.spongycastle.jce.ECNamedCurveTable; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.spec.ECParameterSpec; +import org.spongycastle.util.io.Streams; public class AllTests extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/eac/test/EACTestSetup.java b/pkix/src/test/java/org/spongycastle/eac/test/EACTestSetup.java index 92f884c0..f9158586 100644 --- a/pkix/src/test/java/org/bouncycastle/eac/test/EACTestSetup.java +++ b/pkix/src/test/java/org/spongycastle/eac/test/EACTestSetup.java @@ -1,11 +1,11 @@ -package org.bouncycastle.eac.test; +package org.spongycastle.eac.test; import java.security.Security; import junit.extensions.TestSetup; import junit.framework.Test; -import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.provider.BouncyCastleProvider; class EACTestSetup extends TestSetup @@ -17,7 +17,7 @@ class EACTestSetup protected void setUp() { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } protected void tearDown() diff --git a/pkix/src/test/java/org/bouncycastle/mozilla/test/AllTests.java b/pkix/src/test/java/org/spongycastle/mozilla/test/AllTests.java index 3c0dcc60..e742710b 100644 --- a/pkix/src/test/java/org/bouncycastle/mozilla/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/mozilla/test/AllTests.java @@ -1,9 +1,9 @@ -package org.bouncycastle.mozilla.test; +package org.spongycastle.mozilla.test; import java.security.Security; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.util.test.SimpleTestResult; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.util.test.SimpleTestResult; import junit.framework.*; @@ -14,7 +14,7 @@ public class AllTests { Security.addProvider(new BouncyCastleProvider()); - org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new SPKACTest() }; + org.spongycastle.util.test.Test[] tests = new org.spongycastle.util.test.Test[] { new SPKACTest() }; for (int i = 0; i != tests.length; i++) { diff --git a/pkix/src/test/java/org/bouncycastle/mozilla/test/SPKACTest.java b/pkix/src/test/java/org/spongycastle/mozilla/test/SPKACTest.java index 192bfd86..b8d59f3f 100644 --- a/pkix/src/test/java/org/bouncycastle/mozilla/test/SPKACTest.java +++ b/pkix/src/test/java/org/spongycastle/mozilla/test/SPKACTest.java @@ -1,20 +1,20 @@ -package org.bouncycastle.mozilla.test; +package org.spongycastle.mozilla.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.security.PublicKey; import java.security.Security; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.DERIA5String; -import org.bouncycastle.asn1.DEROutputStream; -import org.bouncycastle.asn1.mozilla.PublicKeyAndChallenge; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.mozilla.SignedPublicKeyAndChallenge; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.ASN1Primitive; +import org.spongycastle.asn1.DERIA5String; +import org.spongycastle.asn1.DEROutputStream; +import org.spongycastle.asn1.mozilla.PublicKeyAndChallenge; +import org.spongycastle.asn1.x509.SubjectPublicKeyInfo; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.mozilla.SignedPublicKeyAndChallenge; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.test.SimpleTest; public class SPKACTest extends SimpleTest @@ -42,7 +42,7 @@ public class SPKACTest spkac = new SignedPublicKeyAndChallenge(req); PublicKeyAndChallenge pkac = spkac.getPublicKeyAndChallenge(); - PublicKey pubKey = spkac.getPublicKey("BC"); + PublicKey pubKey = spkac.getPublicKey("SC"); ASN1Primitive obj = pkac.toASN1Primitive(); if (obj == null) { @@ -92,7 +92,7 @@ public class SPKACTest } } - if (!spkac.verify("BC")) + if (!spkac.verify("SC")) { fail(testName + " verification failed"); } diff --git a/pkix/src/test/java/org/bouncycastle/openssl/test/AllTests.java b/pkix/src/test/java/org/spongycastle/openssl/test/AllTests.java index faae18e8..c432dcaa 100644 --- a/pkix/src/test/java/org/bouncycastle/openssl/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/openssl/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openssl.test; +package org.spongycastle.openssl.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -14,20 +14,20 @@ import java.security.Security; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openssl.PEMParser; -import org.bouncycastle.openssl.PEMWriter; -import org.bouncycastle.openssl.PKCS8Generator; -import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; -import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator; -import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder; -import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; -import org.bouncycastle.pkcs.PKCSException; -import org.bouncycastle.util.test.SimpleTestResult; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.pkcs.PrivateKeyInfo; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.openssl.PEMParser; +import org.spongycastle.openssl.PEMWriter; +import org.spongycastle.openssl.PKCS8Generator; +import org.spongycastle.openssl.jcajce.JcaPEMKeyConverter; +import org.spongycastle.openssl.jcajce.JcaPKCS8Generator; +import org.spongycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder; +import org.spongycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder; +import org.spongycastle.operator.OperatorCreationException; +import org.spongycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; +import org.spongycastle.pkcs.PKCSException; +import org.spongycastle.util.test.SimpleTestResult; public class AllTests @@ -35,12 +35,12 @@ public class { public void testOpenSSL() { - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { Security.addProvider(new BouncyCastleProvider()); } - org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] + org.spongycastle.util.test.Test[] tests = new org.spongycastle.util.test.Test[] { new WriterTest(), new ParserTest() @@ -60,12 +60,12 @@ public class public void testPKCS8Encrypted() throws Exception { - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { Security.addProvider(new BouncyCastleProvider()); } - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC"); kpGen.initialize(1024); @@ -84,7 +84,7 @@ public class JceOpenSSLPKCS8EncryptorBuilder encryptorBuilder = new JceOpenSSLPKCS8EncryptorBuilder(algorithm); - encryptorBuilder.setProvider("BC"); + encryptorBuilder.setProvider("SC"); encryptorBuilder.setPasssword("hello".toCharArray()); PKCS8Generator pkcs8 = new JcaPKCS8Generator(key, encryptorBuilder.build()); @@ -97,7 +97,7 @@ public class PKCS8EncryptedPrivateKeyInfo pInfo = (PKCS8EncryptedPrivateKeyInfo)pRd.readObject(); - PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("BC").getPrivateKey(pInfo.decryptPrivateKeyInfo(new JceOpenSSLPKCS8DecryptorProviderBuilder().setProvider("BC").build("hello".toCharArray()))); + PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("SC").getPrivateKey(pInfo.decryptPrivateKeyInfo(new JceOpenSSLPKCS8DecryptorProviderBuilder().setProvider("SC").build("hello".toCharArray()))); assertEquals(key, rdKey); @@ -106,12 +106,12 @@ public class public void testPKCS8PlainNew() throws Exception { - if (Security.getProvider("BC") == null) + if (Security.getProvider("SC") == null) { Security.addProvider(new BouncyCastleProvider()); } - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "SC"); kpGen.initialize(1024); @@ -128,7 +128,7 @@ public class PrivateKeyInfo kp = (PrivateKeyInfo)pRd.readObject(); - PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("BC").getPrivateKey(kp); + PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("SC").getPrivateKey(kp); assertEquals(key, rdKey); } diff --git a/pkix/src/test/java/org/bouncycastle/openssl/test/ParserTest.java b/pkix/src/test/java/org/spongycastle/openssl/test/ParserTest.java index 521106b1..94c105a6 100644 --- a/pkix/src/test/java/org/bouncycastle/openssl/test/ParserTest.java +++ b/pkix/src/test/java/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; @@ -473,7 +473,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; diff --git a/pkix/src/test/java/org/bouncycastle/openssl/test/WriterTest.java b/pkix/src/test/java/org/spongycastle/openssl/test/WriterTest.java index e41efd6f..ac67e6a0 100644 --- a/pkix/src/test/java/org/bouncycastle/openssl/test/WriterTest.java +++ b/pkix/src/test/java/org/spongycastle/openssl/test/WriterTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.openssl.test; +package org.spongycastle.openssl.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -17,20 +17,20 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.RSAPrivateCrtKeySpec; import java.util.List; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -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.JcaMiscPEMGenerator; -import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; -import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; -import org.bouncycastle.openssl.jcajce.JcePEMEncryptorBuilder; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.util.io.pem.PemHeader; -import org.bouncycastle.util.io.pem.PemObject; -import org.bouncycastle.util.test.SimpleTest; +import org.spongycastle.jce.provider.BouncyCastleProvider; +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.JcaMiscPEMGenerator; +import org.spongycastle.openssl.jcajce.JcaPEMKeyConverter; +import org.spongycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; +import org.spongycastle.openssl.jcajce.JcePEMEncryptorBuilder; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.util.io.pem.PemHeader; +import org.spongycastle.util.io.pem.PemObject; +import org.spongycastle.util.test.SimpleTest; public class WriterTest extends SimpleTest @@ -100,7 +100,7 @@ public class WriterTest public void performTest() throws Exception { - final String provider = "BC"; + final String provider = "SC"; KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", provider); dsaKpg.initialize(testDsaParams, random); @@ -123,14 +123,14 @@ public class WriterTest doWriteReadTest(testEcDsaKey, provider); doWriteReadTests(testEcDsaKey, provider, algorithms); - KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC"); + KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "SC"); kpGen.initialize(239); PrivateKey privKey = kpGen.generateKeyPair().getPrivate(); doWriteReadTest(privKey, provider); - doWriteReadTests(privKey, "BC", algorithms); + doWriteReadTests(privKey, "SC", algorithms); // override test PEMWriter pWrt = new PEMWriter(new OutputStreamWriter(new ByteArrayOutputStream())); @@ -175,7 +175,7 @@ public class WriterTest fail("Didn't find OpenSSL key"); } - KeyPair kp = new JcaPEMKeyConverter().setProvider("BC").getKeyPair((PEMKeyPair)o); + KeyPair kp = new JcaPEMKeyConverter().setProvider("SC").getKeyPair((PEMKeyPair)o); PrivateKey privKey = kp.getPrivate(); if (!akp.equals(privKey)) @@ -229,7 +229,7 @@ public class WriterTest fail("Didn't find OpenSSL key"); } - KeyPair kp = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(((PEMEncryptedKeyPair)o).decryptKeyPair(new JcePEMDecryptorProviderBuilder().setProvider("BC").build(testPassword))); + KeyPair kp = new JcaPEMKeyConverter().setProvider("SC").getKeyPair(((PEMEncryptedKeyPair)o).decryptKeyPair(new JcePEMDecryptorProviderBuilder().setProvider("SC").build(testPassword))); PrivateKey privKey = kp.getPrivate(); if (!akp.equals(privKey)) diff --git a/pkix/src/test/java/org/bouncycastle/pkcs/test/AllTests.java b/pkix/src/test/java/org/spongycastle/pkcs/test/AllTests.java index 809c5c54..6751bfa4 100644 --- a/pkix/src/test/java/org/bouncycastle/pkcs/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/pkcs/test/AllTests.java @@ -1,4 +1,4 @@ -package org.bouncycastle.pkcs.test; +package org.spongycastle.pkcs.test; import junit.framework.Test; import junit.framework.TestCase; diff --git a/pkix/src/test/java/org/bouncycastle/pkcs/test/BCTestSetup.java b/pkix/src/test/java/org/spongycastle/pkcs/test/BCTestSetup.java index 7a13561a..c73d568f 100644 --- a/pkix/src/test/java/org/bouncycastle/pkcs/test/BCTestSetup.java +++ b/pkix/src/test/java/org/spongycastle/pkcs/test/BCTestSetup.java @@ -1,5 +1,5 @@ // Copyright (c) 2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) -package org.bouncycastle.pkcs.test; +package org.spongycastle.pkcs.test; import java.security.Security; @@ -16,11 +16,11 @@ class BCTestSetup protected void setUp() { - Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); + Security.addProvider(new org.spongycastle.jce.provider.BouncyCastleProvider()); } protected void tearDown() { - Security.removeProvider("BC"); + Security.removeProvider("SC"); } } diff --git a/pkix/src/test/java/org/bouncycastle/pkcs/test/PKCS10Test.java b/pkix/src/test/java/org/spongycastle/pkcs/test/PKCS10Test.java index a0c13d22..de50acbc 100644 --- a/pkix/src/test/java/org/bouncycastle/pkcs/test/PKCS10Test.java +++ b/pkix/src/test/java/org/spongycastle/pkcs/test/PKCS10Test.java @@ -1,4 +1,4 @@ -package org.bouncycastle.pkcs.test; +package org.spongycastle.pkcs.test; import java.math.BigInteger; import java.security.KeyFactory; @@ -10,12 +10,12 @@ import java.security.spec.RSAPublicKeySpec; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.bouncycastle.asn1.pkcs.CertificationRequest; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.pkcs.PKCS10CertificationRequest; -import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder; -import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; +import org.spongycastle.asn1.pkcs.CertificationRequest; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.pkcs.PKCS10CertificationRequest; +import org.spongycastle.pkcs.PKCS10CertificationRequestBuilder; +import org.spongycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder; public class PKCS10Test extends TestCase @@ -40,27 +40,27 @@ public class PKCS10Test public void testLeaveOffEmpty() throws Exception { - KeyFactory keyFact = KeyFactory.getInstance("RSA", "BC"); + KeyFactory keyFact = KeyFactory.getInstance("RSA", "SC"); PublicKey pubKey = keyFact.generatePublic(pubKeySpec); PrivateKey privKey = keyFact.generatePrivate(privKeySpec); PKCS10CertificationRequestBuilder pkcs10Builder = new JcaPKCS10CertificationRequestBuilder(new X500Name("CN=Test"), pubKey); - PKCS10CertificationRequest request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey)); + PKCS10CertificationRequest request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("SC").build(privKey)); assertEquals(0, request.getAttributes().length); assertNotNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes()); pkcs10Builder.setLeaveOffEmptyAttributes(true); - request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey)); + request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("SC").build(privKey)); assertEquals(0, request.getAttributes().length); assertNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes()); pkcs10Builder.setLeaveOffEmptyAttributes(false); - request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey)); + request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("SC").build(privKey)); assertEquals(0, request.getAttributes().length); assertNotNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes()); diff --git a/pkix/src/test/java/org/bouncycastle/pkcs/test/PfxPduTest.java b/pkix/src/test/java/org/spongycastle/pkcs/test/PfxPduTest.java index 931ed128..dfb971a9 100644 --- a/pkix/src/test/java/org/bouncycastle/pkcs/test/PfxPduTest.java +++ b/pkix/src/test/java/org/spongycastle/pkcs/test/PfxPduTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.pkcs.test; +package org.spongycastle.pkcs.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -11,58 +11,58 @@ import java.security.spec.RSAPublicKeySpec; import java.util.Date; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1Encodable; -import org.bouncycastle.asn1.ASN1Encoding; -import org.bouncycastle.asn1.DERBMPString; -import org.bouncycastle.asn1.DERSequence; -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.Attribute; -import org.bouncycastle.asn1.pkcs.ContentInfo; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; -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.Extension; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.X509v1CertificateBuilder; -import org.bouncycastle.cert.X509v3CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX500NameUtil; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder; -import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; -import org.bouncycastle.crypto.engines.DESedeEngine; -import org.bouncycastle.crypto.engines.RC2Engine; -import org.bouncycastle.crypto.modes.CBCBlockCipher; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.InputDecryptorProvider; -import org.bouncycastle.operator.OutputEncryptor; -import org.bouncycastle.operator.bc.BcDefaultDigestProvider; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.pkcs.PKCS12PfxPdu; -import org.bouncycastle.pkcs.PKCS12PfxPduBuilder; -import org.bouncycastle.pkcs.PKCS12SafeBag; -import org.bouncycastle.pkcs.PKCS12SafeBagBuilder; -import org.bouncycastle.pkcs.PKCS12SafeBagFactory; -import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; -import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfoBuilder; -import org.bouncycastle.pkcs.PKCSException; -import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilder; -import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilderProvider; -import org.bouncycastle.pkcs.bc.BcPKCS12PBEInputDecryptorProviderBuilder; -import org.bouncycastle.pkcs.bc.BcPKCS12PBEOutputEncryptorBuilder; -import org.bouncycastle.pkcs.jcajce.JcaPKCS12SafeBagBuilder; -import org.bouncycastle.pkcs.jcajce.JcaPKCS8EncryptedPrivateKeyInfoBuilder; -import org.bouncycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilder; -import org.bouncycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilderProvider; -import org.bouncycastle.pkcs.jcajce.JcePKCSPBEInputDecryptorProviderBuilder; -import org.bouncycastle.pkcs.jcajce.JcePKCSPBEOutputEncryptorBuilder; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1Encodable; +import org.spongycastle.asn1.ASN1Encoding; +import org.spongycastle.asn1.DERBMPString; +import org.spongycastle.asn1.DERSequence; +import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers; +import org.spongycastle.asn1.nist.NISTObjectIdentifiers; +import org.spongycastle.asn1.pkcs.Attribute; +import org.spongycastle.asn1.pkcs.ContentInfo; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.pkcs.PrivateKeyInfo; +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.Extension; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.X509v1CertificateBuilder; +import org.spongycastle.cert.X509v3CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX500NameUtil; +import org.spongycastle.cert.jcajce.JcaX509CertificateConverter; +import org.spongycastle.cert.jcajce.JcaX509ExtensionUtils; +import org.spongycastle.cert.jcajce.JcaX509v1CertificateBuilder; +import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder; +import org.spongycastle.crypto.engines.DESedeEngine; +import org.spongycastle.crypto.engines.RC2Engine; +import org.spongycastle.crypto.modes.CBCBlockCipher; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.InputDecryptorProvider; +import org.spongycastle.operator.OutputEncryptor; +import org.spongycastle.operator.bc.BcDefaultDigestProvider; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.pkcs.PKCS12PfxPdu; +import org.spongycastle.pkcs.PKCS12PfxPduBuilder; +import org.spongycastle.pkcs.PKCS12SafeBag; +import org.spongycastle.pkcs.PKCS12SafeBagBuilder; +import org.spongycastle.pkcs.PKCS12SafeBagFactory; +import org.spongycastle.pkcs.PKCS8EncryptedPrivateKeyInfo; +import org.spongycastle.pkcs.PKCS8EncryptedPrivateKeyInfoBuilder; +import org.spongycastle.pkcs.PKCSException; +import org.spongycastle.pkcs.bc.BcPKCS12MacCalculatorBuilder; +import org.spongycastle.pkcs.bc.BcPKCS12MacCalculatorBuilderProvider; +import org.spongycastle.pkcs.bc.BcPKCS12PBEInputDecryptorProviderBuilder; +import org.spongycastle.pkcs.bc.BcPKCS12PBEOutputEncryptorBuilder; +import org.spongycastle.pkcs.jcajce.JcaPKCS12SafeBagBuilder; +import org.spongycastle.pkcs.jcajce.JcaPKCS8EncryptedPrivateKeyInfoBuilder; +import org.spongycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilder; +import org.spongycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilderProvider; +import org.spongycastle.pkcs.jcajce.JcePKCSPBEInputDecryptorProviderBuilder; +import org.spongycastle.pkcs.jcajce.JcePKCSPBEOutputEncryptorBuilder; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Base64; public class PfxPduTest extends TestCase @@ -697,7 +697,7 @@ public class PfxPduTest // // now try reading our object // - KeyStore store = KeyStore.getInstance("PKCS12", "BC"); + KeyStore store = KeyStore.getInstance("PKCS12", "SC"); store.load(new ByteArrayInputStream(pfx.toASN1Structure().getEncoded()), passwd); @@ -910,7 +910,7 @@ public class PfxPduTest throws Exception { InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(pkcs12Pass.toCharArray()); + .setProvider("SC").build(pkcs12Pass.toCharArray()); PKCS12PfxPdu pfx = new PKCS12PfxPdu(pkcs12); ContentInfo[] infos = pfx.getContentInfos(); @@ -946,7 +946,7 @@ public class PfxPduTest throws Exception { InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(sha256Pass.toCharArray()); + .setProvider("SC").build(sha256Pass.toCharArray()); PKCS12PfxPdu pfx = new PKCS12PfxPdu(sha256Pfx); ContentInfo[] infos = pfx.getContentInfos(); @@ -981,7 +981,7 @@ public class PfxPduTest public void testCreateAES256andSHA256() throws Exception { - OutputEncryptor encOut = new JcePKCSPBEOutputEncryptorBuilder(NISTObjectIdentifiers.id_aes256_CBC).setProvider("BC").build(passwd); + OutputEncryptor encOut = new JcePKCSPBEOutputEncryptorBuilder(NISTObjectIdentifiers.id_aes256_CBC).setProvider("SC").build(passwd); KeyFactory fact = KeyFactory.getInstance("RSA", BC); PrivateKey privKey = fact.generatePrivate(privKeySpec); @@ -1013,15 +1013,15 @@ public class PfxPduTest builder.addData(keyBagBuilder.build()); - builder.addEncryptedData(new JcePKCSPBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC).setProvider("BC").build(passwd), new PKCS12SafeBag[] { eeCertBagBuilder.build(), caCertBagBuilder.build(), taCertBagBuilder.build() }); + builder.addEncryptedData(new JcePKCSPBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC).setProvider("SC").build(passwd), new PKCS12SafeBag[] { eeCertBagBuilder.build(), caCertBagBuilder.build(), taCertBagBuilder.build() }); PKCS12PfxPdu pfx = builder.build(new JcePKCS12MacCalculatorBuilder(NISTObjectIdentifiers.id_sha256), passwd); assertTrue(pfx.hasMac()); - assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), passwd)); + assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("SC"), passwd)); InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(passwd); + .setProvider("SC").build(passwd); pfx = new PKCS12PfxPdu(pfx.toASN1Structure().getEncoded()); @@ -1059,7 +1059,7 @@ public class PfxPduTest assertTrue(encDataFound); assertTrue(pkcs8Found); - KeyStore ks = KeyStore.getInstance("PKCS12", "BC"); + KeyStore ks = KeyStore.getInstance("PKCS12", "SC"); ks.load(new ByteArrayInputStream(pfx.getEncoded(ASN1Encoding.DL)), passwd); @@ -1080,7 +1080,7 @@ public class PfxPduTest throws Exception { InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(pkcs5Pass.toCharArray()); + .setProvider("SC").build(pkcs5Pass.toCharArray()); PKCS12PfxPdu pfx = new PKCS12PfxPdu(keyStore); ContentInfo[] infos = pfx.getContentInfos(); @@ -1118,11 +1118,11 @@ public class PfxPduTest char[] password = "1".toCharArray(); InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(password); + .setProvider("SC").build(password); PKCS12PfxPdu pfx = new PKCS12PfxPdu(gostPfx); assertTrue(pfx.hasMac()); - assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), password)); + assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("SC"), password)); ContentInfo[] infos = pfx.getContentInfos(); @@ -1160,11 +1160,11 @@ public class PfxPduTest char[] password = "foo123".toCharArray(); InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder() - .setProvider("BC").build(password); + .setProvider("SC").build(password); PKCS12PfxPdu pfx = new PKCS12PfxPdu(gostPfxFoo123); assertTrue(pfx.hasMac()); - assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), password)); + assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("SC"), password)); ContentInfo[] infos = pfx.getContentInfos(); diff --git a/pkix/src/test/java/org/bouncycastle/tsp/GenTimeAccuracyUnitTest.java b/pkix/src/test/java/org/spongycastle/tsp/GenTimeAccuracyUnitTest.java index 0090b30f..ba4ca49e 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/GenTimeAccuracyUnitTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/GenTimeAccuracyUnitTest.java @@ -1,8 +1,8 @@ -package org.bouncycastle.tsp; +package org.spongycastle.tsp; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.tsp.Accuracy; +import org.spongycastle.asn1.ASN1Integer; +import org.spongycastle.asn1.tsp.Accuracy; public class GenTimeAccuracyUnitTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/TimeStampTokenInfoUnitTest.java b/pkix/src/test/java/org/spongycastle/tsp/TimeStampTokenInfoUnitTest.java index b6924a2b..39e7285d 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/TimeStampTokenInfoUnitTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/TimeStampTokenInfoUnitTest.java @@ -1,13 +1,13 @@ -package org.bouncycastle.tsp; +package org.spongycastle.tsp; import java.io.IOException; import java.math.BigInteger; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.tsp.TSTInfo; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.encoders.Hex; +import org.spongycastle.asn1.ASN1InputStream; +import org.spongycastle.asn1.tsp.TSTInfo; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.encoders.Hex; public class TimeStampTokenInfoUnitTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/AllTests.java b/pkix/src/test/java/org/spongycastle/tsp/test/AllTests.java index 19fc664d..5a990772 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/AllTests.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/AllTests.java @@ -1,11 +1,11 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.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.spongycastle.jce.provider.BouncyCastleProvider; public class AllTests extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java index a9ab7db6..2af0992a 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -13,28 +13,28 @@ import java.util.Date; import java.util.List; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import org.bouncycastle.tsp.TSPAlgorithms; -import org.bouncycastle.tsp.TimeStampRequest; -import org.bouncycastle.tsp.TimeStampRequestGenerator; -import org.bouncycastle.tsp.TimeStampResponse; -import org.bouncycastle.tsp.TimeStampResponseGenerator; -import org.bouncycastle.tsp.TimeStampToken; -import org.bouncycastle.tsp.TimeStampTokenGenerator; -import org.bouncycastle.tsp.cms.CMSTimeStampedData; -import org.bouncycastle.tsp.cms.CMSTimeStampedDataGenerator; -import org.bouncycastle.tsp.cms.CMSTimeStampedDataParser; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.nist.NISTObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculator; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.bc.BcDigestCalculatorProvider; +import org.spongycastle.tsp.TSPAlgorithms; +import org.spongycastle.tsp.TimeStampRequest; +import org.spongycastle.tsp.TimeStampRequestGenerator; +import org.spongycastle.tsp.TimeStampResponse; +import org.spongycastle.tsp.TimeStampResponseGenerator; +import org.spongycastle.tsp.TimeStampToken; +import org.spongycastle.tsp.TimeStampTokenGenerator; +import org.spongycastle.tsp.cms.CMSTimeStampedData; +import org.spongycastle.tsp.cms.CMSTimeStampedDataGenerator; +import org.spongycastle.tsp.cms.CMSTimeStampedDataParser; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Store; +import org.spongycastle.util.io.Streams; public class CMSTimeStampedDataGeneratorTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataParserTest.java index 138e892b..5fa14db7 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataParserTest.java @@ -1,16 +1,16 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import junit.framework.TestCase; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import org.bouncycastle.tsp.TimeStampToken; -import org.bouncycastle.tsp.cms.CMSTimeStampedDataParser; -import org.bouncycastle.util.io.Streams; +import org.spongycastle.operator.DigestCalculator; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.bc.BcDigestCalculatorProvider; +import org.spongycastle.tsp.TimeStampToken; +import org.spongycastle.tsp.cms.CMSTimeStampedDataParser; +import org.spongycastle.util.io.Streams; public class CMSTimeStampedDataParserTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataTest.java index 0bfefaa6..7f97dccb 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/CMSTimeStampedDataTest.java @@ -1,14 +1,14 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; import junit.framework.TestCase; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.bc.BcDigestCalculatorProvider; -import org.bouncycastle.tsp.TimeStampToken; -import org.bouncycastle.tsp.cms.CMSTimeStampedData; +import org.spongycastle.operator.DigestCalculator; +import org.spongycastle.operator.DigestCalculatorProvider; +import org.spongycastle.operator.bc.BcDigestCalculatorProvider; +import org.spongycastle.tsp.TimeStampToken; +import org.spongycastle.tsp.cms.CMSTimeStampedData; public class CMSTimeStampedDataTest extends TestCase diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java b/pkix/src/test/java/org/spongycastle/tsp/test/NewTSPTest.java index 3aa3e97e..e40ae0fc 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/NewTSPTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/NewTSPTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.OutputStream; import java.math.BigInteger; @@ -14,44 +14,44 @@ import java.util.List; import java.util.Map; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.cmp.PKIFailureInfo; -import org.bouncycastle.asn1.cmp.PKIStatus; -import org.bouncycastle.asn1.cms.AttributeTable; -import org.bouncycastle.asn1.ess.ESSCertID; -import org.bouncycastle.asn1.ess.ESSCertIDv2; -import org.bouncycastle.asn1.ess.SigningCertificate; -import org.bouncycastle.asn1.ess.SigningCertificateV2; -import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.asn1.x509.GeneralNames; -import org.bouncycastle.asn1.x509.IssuerSerial; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cms.CMSAttributeTableGenerationException; -import org.bouncycastle.cms.CMSAttributeTableGenerator; -import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator; -import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.bouncycastle.tsp.GenTimeAccuracy; -import org.bouncycastle.tsp.TSPAlgorithms; -import org.bouncycastle.tsp.TSPException; -import org.bouncycastle.tsp.TSPValidationException; -import org.bouncycastle.tsp.TimeStampRequest; -import org.bouncycastle.tsp.TimeStampRequestGenerator; -import org.bouncycastle.tsp.TimeStampResponse; -import org.bouncycastle.tsp.TimeStampResponseGenerator; -import org.bouncycastle.tsp.TimeStampToken; -import org.bouncycastle.tsp.TimeStampTokenGenerator; -import org.bouncycastle.tsp.TimeStampTokenInfo; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Store; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.cmp.PKIFailureInfo; +import org.spongycastle.asn1.cmp.PKIStatus; +import org.spongycastle.asn1.cms.AttributeTable; +import org.spongycastle.asn1.ess.ESSCertID; +import org.spongycastle.asn1.ess.ESSCertIDv2; +import org.spongycastle.asn1.ess.SigningCertificate; +import org.spongycastle.asn1.ess.SigningCertificateV2; +import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers; +import org.spongycastle.asn1.x500.X500Name; +import org.spongycastle.asn1.x509.GeneralName; +import org.spongycastle.asn1.x509.GeneralNames; +import org.spongycastle.asn1.x509.IssuerSerial; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cert.jcajce.JcaCertStore; +import org.spongycastle.cms.CMSAttributeTableGenerationException; +import org.spongycastle.cms.CMSAttributeTableGenerator; +import org.spongycastle.cms.DefaultSignedAttributeTableGenerator; +import org.spongycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.operator.DigestCalculator; +import org.spongycastle.operator.jcajce.JcaContentSignerBuilder; +import org.spongycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.spongycastle.tsp.GenTimeAccuracy; +import org.spongycastle.tsp.TSPAlgorithms; +import org.spongycastle.tsp.TSPException; +import org.spongycastle.tsp.TSPValidationException; +import org.spongycastle.tsp.TimeStampRequest; +import org.spongycastle.tsp.TimeStampRequestGenerator; +import org.spongycastle.tsp.TimeStampResponse; +import org.spongycastle.tsp.TimeStampResponseGenerator; +import org.spongycastle.tsp.TimeStampToken; +import org.spongycastle.tsp.TimeStampTokenGenerator; +import org.spongycastle.tsp.TimeStampTokenInfo; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Store; public class NewTSPTest extends TestCase @@ -180,7 +180,7 @@ public class NewTSPTest Store certs) throws Exception { - JcaSimpleSignerInfoGeneratorBuilder signerInfoGenBuilder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider("BC"); + JcaSimpleSignerInfoGeneratorBuilder signerInfoGenBuilder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider("SC"); IssuerSerial issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509CertificateHolder(cert.getEncoded()).getIssuer())), cert.getSerialNumber()); @@ -311,7 +311,7 @@ public class NewTSPTest TimeStampToken tsToken = tsResp.getTimeStampToken(); - tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); // // check validation @@ -652,7 +652,7 @@ public class NewTSPTest TimeStampToken tsToken = tsResp.getTimeStampToken(); - tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); // // check validation @@ -730,7 +730,7 @@ public class NewTSPTest TimeStampToken tsToken = tsResp.getTimeStampToken(); - tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); // // check validation @@ -794,7 +794,7 @@ public class NewTSPTest TimeStampToken tsToken = tsResp.getTimeStampToken(); - tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); // // check validation diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/ParseTest.java b/pkix/src/test/java/org/spongycastle/tsp/test/ParseTest.java index 46821d48..4bc4c985 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/ParseTest.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/ParseTest.java @@ -1,4 +1,4 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -7,18 +7,18 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import junit.framework.TestCase; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.cmp.PKIFailureInfo; -import org.bouncycastle.asn1.cmp.PKIStatus; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.tsp.TSPAlgorithms; -import org.bouncycastle.tsp.TimeStampRequest; -import org.bouncycastle.tsp.TimeStampResponse; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Store; -import org.bouncycastle.util.encoders.Base64; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.cmp.PKIFailureInfo; +import org.spongycastle.asn1.cmp.PKIStatus; +import org.spongycastle.cert.X509CertificateHolder; +import org.spongycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder; +import org.spongycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.tsp.TSPAlgorithms; +import org.spongycastle.tsp.TimeStampRequest; +import org.spongycastle.tsp.TimeStampResponse; +import org.spongycastle.util.Arrays; +import org.spongycastle.util.Store; +import org.spongycastle.util.encoders.Base64; /** * Test Cases @@ -242,7 +242,7 @@ public class ParseTest + "WruAAg/Lj4r0f9vN12wRlHoS2UKDjrE1DnUBbrM="); /* (non-Javadoc) - * @see org.bouncycastle.util.test.Test#getName() + * @see org.spongycastle.util.test.Test#getName() */ public String getName() { @@ -323,13 +323,13 @@ public class ParseTest TimeStampRequest req = new TimeStampRequest(request); TimeStampResponse resp = new TimeStampResponse(response); - CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC"); + CertificateFactory fact = CertificateFactory.getInstance("X.509", "SC"); X509Certificate cert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signingCert)); resp.validate(req); - resp.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + resp.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); } private void unacceptableResponseParse( @@ -399,7 +399,7 @@ public class ParseTest Store store = response.getTimeStampToken().getCertificates(); X509CertificateHolder cert = (X509CertificateHolder)store.getMatches(response.getTimeStampToken().getSID()).iterator().next(); - response.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)); + response.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SC").build(cert)); } public void parse( diff --git a/pkix/src/test/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java b/pkix/src/test/java/org/spongycastle/tsp/test/SHA1DigestCalculator.java index 934bfcff..9d53e933 100644 --- a/pkix/src/test/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/SHA1DigestCalculator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.cms.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA1Digest; -import org.bouncycastle.operator.DigestCalculator; +import org.spongycastle.asn1.oiw.OIWObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA1Digest; +import org.spongycastle.operator.DigestCalculator; class SHA1DigestCalculator diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java b/pkix/src/test/java/org/spongycastle/tsp/test/SHA256DigestCalculator.java index 89b0a1f2..ee5fc3d9 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/SHA256DigestCalculator.java @@ -1,13 +1,13 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; -import org.bouncycastle.asn1.x509.AlgorithmIdentifier; -import org.bouncycastle.crypto.Digest; -import org.bouncycastle.crypto.digests.SHA256Digest; -import org.bouncycastle.operator.DigestCalculator; +import org.spongycastle.asn1.nist.NISTObjectIdentifiers; +import org.spongycastle.asn1.x509.AlgorithmIdentifier; +import org.spongycastle.crypto.Digest; +import org.spongycastle.crypto.digests.SHA256Digest; +import org.spongycastle.operator.DigestCalculator; class SHA256DigestCalculator diff --git a/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java b/pkix/src/test/java/org/spongycastle/tsp/test/TSPTestUtil.java index e9d94262..e4b78929 100644 --- a/pkix/src/test/java/org/bouncycastle/tsp/test/TSPTestUtil.java +++ b/pkix/src/test/java/org/spongycastle/tsp/test/TSPTestUtil.java @@ -1,4 +1,4 @@ -package org.bouncycastle.tsp.test; +package org.spongycastle.tsp.test; import java.io.IOException; import java.math.BigInteger; @@ -14,17 +14,17 @@ import java.util.Date; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier; -import org.bouncycastle.asn1.x509.BasicConstraints; -import org.bouncycastle.asn1.x509.ExtendedKeyUsage; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.X509Name; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -import org.bouncycastle.util.encoders.Base64; -import org.bouncycastle.x509.X509V3CertificateGenerator; +import org.spongycastle.asn1.ASN1ObjectIdentifier; +import org.spongycastle.asn1.x509.AuthorityKeyIdentifier; +import org.spongycastle.asn1.x509.BasicConstraints; +import org.spongycastle.asn1.x509.ExtendedKeyUsage; +import org.spongycastle.asn1.x509.Extension; +import org.spongycastle.asn1.x509.KeyPurposeId; +import org.spongycastle.asn1.x509.SubjectKeyIdentifier; +import org.spongycastle.asn1.x509.X509Name; +import org.spongycastle.cert.jcajce.JcaX509ExtensionUtils; +import org.spongycastle.util.encoders.Base64; +import org.spongycastle.x509.X509V3CertificateGenerator; public class TSPTestUtil { @@ -58,22 +58,22 @@ public class TSPTestUtil { rand = new SecureRandom(); - kpg = KeyPairGenerator.getInstance("RSA", "BC"); + kpg = KeyPairGenerator.getInstance("RSA", "SC"); kpg.initialize(1024, rand); - desede128kg = KeyGenerator.getInstance("DESEDE", "BC"); + desede128kg = KeyGenerator.getInstance("DESEDE", "SC"); desede128kg.init(112, rand); - desede192kg = KeyGenerator.getInstance("DESEDE", "BC"); + desede192kg = KeyGenerator.getInstance("DESEDE", "SC"); desede192kg.init(168, rand); - rc240kg = KeyGenerator.getInstance("RC2", "BC"); + rc240kg = KeyGenerator.getInstance("RC2", "SC"); rc240kg.init(40, rand); - rc264kg = KeyGenerator.getInstance("RC2", "BC"); + rc264kg = KeyGenerator.getInstance("RC2", "SC"); rc264kg.init(64, rand); - rc2128kg = KeyGenerator.getInstance("RC2", "BC"); + rc2128kg = KeyGenerator.getInstance("RC2", "SC"); rc2128kg.init(128, rand); serialNumber = new BigInteger("1"); |