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

gitlab.com/quite/humla-spongycastle.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/test')
-rw-r--r--core/src/test/j2me/java/math/test/BigIntegerTest.java2
-rw-r--r--core/src/test/j2me/java/math/test/RegressionTest.java4
-rw-r--r--core/src/test/j2me/org/spongycastle/asn1/test/GeneralizedTimeTest.java (renamed from core/src/test/j2me/org/bouncycastle/asn1/test/GeneralizedTimeTest.java)8
-rw-r--r--core/src/test/j2me/org/spongycastle/asn1/test/RegressionTest.java (renamed from core/src/test/j2me/org/bouncycastle/asn1/test/RegressionTest.java)6
-rw-r--r--core/src/test/j2me/org/spongycastle/asn1/test/UTCTimeTest.java (renamed from core/src/test/j2me/org/bouncycastle/asn1/test/UTCTimeTest.java)8
-rw-r--r--core/src/test/j2me/org/spongycastle/crypto/test/BigIntegerTest.java (renamed from core/src/test/j2me/org/bouncycastle/crypto/test/BigIntegerTest.java)4
-rw-r--r--core/src/test/j2me/org/spongycastle/crypto/test/CryptoRegressionTest.java (renamed from core/src/test/j2me/org/bouncycastle/crypto/test/CryptoRegressionTest.java)4
-rw-r--r--core/src/test/j2me/org/spongycastle/crypto/test/RSATest.java (renamed from core/src/test/j2me/org/bouncycastle/crypto/test/RSATest.java)30
-rw-r--r--core/src/test/j2me/org/spongycastle/crypto/test/RegressionTest.java (renamed from core/src/test/j2me/org/bouncycastle/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ASN1SequenceParserTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ASN1UnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ASN1UnitTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/AdmissionSyntaxUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/AdmissionsUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/AttributeTableUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/BiometricDataUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/BitStringConstantTester.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/BitStringConstantTester.java)2
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/BitStringTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/BitStringTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CMSTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CMSTest.java)52
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CertHashUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CertificateTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CertificateTest.java)60
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeIndicationUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeQualifierUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ContentHintsUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/CscaMasterListTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/CscaMasterListTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/DERApplicationSpecificTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/DERUTF8StringTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/DataGroupHashUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/DeclarationOfMajorityUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ESSCertIDv2UnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/EncryptedPrivateKeyInfoTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/EnumeratedTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/EnumeratedTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/EqualsAndHashCodeTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java)66
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/GeneralNameTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/GeneralNameTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/GeneralizedTimeTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/GenerationTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/GenerationTest.java)82
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/GetInstanceTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/GetInstanceTest.java)572
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/InputStreamTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/InputStreamTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/IssuingDistributionPointUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/KeyUsageTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/KeyUsageTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/LDSSecurityObjectUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/MiscTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/MiscTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/MonetaryLimitUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/MonetaryValueUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/NameOrPseudonymUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/NamingAuthorityUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/NetscapeCertTypeTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/OCSPTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/OCSPTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/OIDTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ObjectIdentifierTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/OctetStringTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java)26
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/OtherCertIDUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/OtherSigningCertificateUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/PKCS10Test.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/PKCS10Test.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/PKCS12Test.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/PKCS12Test.java)40
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/PKIFailureInfoTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ParseTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ParseTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ParsingTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ParsingTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/PersonalDataUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ProcurationSyntaxUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ProfessionInfoUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/QCStatementUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/RFC4519Test.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/RFC4519Test.java)16
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/ReasonFlagsTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/RegressionTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/RegressionTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/RequestedCertificateUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/RestrictionUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/SMIMETest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/SMIMETest.java)28
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/SemanticsInformationUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/SetTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/SetTest.java)28
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/SignerLocationUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/StringTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/StringTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/SubjectKeyIdentifierTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/TagTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/TagTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/TargetInformationTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/TargetInformationTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/TypeOfBiometricDataUnitTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/UTCTimeTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/UTCTimeTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/X500NameTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/X500NameTest.java)54
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/X509ExtensionsTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/X509NameTest.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java)46
-rw-r--r--core/src/test/java/org/spongycastle/asn1/test/X9Test.java (renamed from core/src/test/java/org/bouncycastle/asn1/test/X9Test.java)36
-rw-r--r--core/src/test/java/org/spongycastle/crypto/agreement/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/agreement/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEParticipantTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEUtilTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/ec/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/ec/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/ec/test/ECElGamalTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/ec/test/ECTransformationTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java)42
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/CTRDRBGTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/DRBGTestVector.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/DualECDRBGTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/FixedSecureRandomTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/HMacDRBGTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/HashDRBGTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/RegressionTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/RegressionTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/SP800RandomTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/prng/test/TestEntropySourceProvider.java (renamed from core/src/test/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AEADTestUtil.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AEADTestUtil.java)26
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESFastTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESFastTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESLightTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESLightTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESTest.java)28
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESVectorFileTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESWrapPadTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESWrapPadTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AESWrapTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AESWrapTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/BlockCipherMonteCarloTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/BlockCipherResetTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java)66
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/BlockCipherVectorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/BlowfishTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/BlowfishTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CAST5Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CAST5Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CAST6Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CAST6Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CCMTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CCMTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CMacTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CTSTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CTSTest.java)36
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CamelliaLightTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CamelliaLightTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CamelliaTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CamelliaTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ChaChaTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ChaChaTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CipherStreamTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CipherStreamTest.java)96
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CipherTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CipherTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/CramerShoupTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/CramerShoupTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DESTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DESTest.java)26
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DESedeTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DESedeTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DHKEKGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DHTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DHTest.java)26
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DSATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DSATest.java)38
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DSTU4145Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DSTU4145Test.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DeterministicDSATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DeterministicDSATest.java)40
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DigestRandomNumberTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/DigestTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/EAXTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/EAXTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ECDHKEKGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ECGOST3410Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECGOST3410Test.java)30
-rwxr-xr-xcore/src/test/java/org/spongycastle/crypto/test/ECIESKeyEncapsulationTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ECIESTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECIESTest.java)58
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ECNRTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECNRTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ECTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ECTest.java)50
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ElGamalTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ElGamalTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/EqualsHashCodeTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java)42
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GCMReorderTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GCMReorderTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GCMTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GCMTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GMacTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GOST28147MacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GOST28147MacTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GOST28147Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GOST28147Test.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GOST3410Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GOST3410Test.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/GOST3411DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Grain128Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Grain128Test.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Grainv1Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Grainv1Test.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/HCFamilyTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/HCFamilyTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/HCFamilyVecTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/HKDFGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/HashCommitmentTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/HashCommitmentTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/IDEATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/IDEATest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ISAACTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ISAACTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ISO9796Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ISO9796Test.java)38
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ISO9797Alg3MacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/KDF1GeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/KDF2GeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/KDFCounterGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/KDFFeedbackGeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MD2DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MD2DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MD4DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MD4DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MD5DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MD5DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MD5HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MD5HMacTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MGF1GeneratorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/MacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/MacTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ModeTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ModeTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/NaccacheSternTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/NaccacheSternTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/NoekeonTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/NoekeonTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/NonMemoableDigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/NullTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/NullTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/OAEPTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/OAEPTest.java)36
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/OCBTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/OCBTest.java)26
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/PKCS12Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/PKCS12Test.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/PKCS5Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/PKCS5Test.java)48
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/PSSBlindTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/PSSBlindTest.java)32
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/PSSTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/PSSTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/PaddingTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/PaddingTest.java)28
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Poly1305Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Poly1305Test.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RC2Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RC2Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RC2WrapTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RC2WrapTest.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RC4Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RC4Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RC5Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RC5Test.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RC6Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RC6Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RFC3211WrapTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD128DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD128HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD160DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD160HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD256DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RIPEMD320DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RSABlindedTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RSABlindedTest.java)28
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RSADigestSignerTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java)18
-rwxr-xr-xcore/src/test/java/org/spongycastle/crypto/test/RSAKeyEncapsulationTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RSATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RSATest.java)30
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RegressionTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ResetTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ResetTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/RijndaelTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/RijndaelTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SCryptTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SCryptTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SEEDTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SEEDTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA1DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA1DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA1HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA1HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA224DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA224DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA224HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA224HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA256DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA256DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA256HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA256HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA384DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA384DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA384HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA384HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA3DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA3DigestTest.java)20
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA512DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA512DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA512HMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA512HMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA512t224DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SHA512t256DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SM3DigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SM3DigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SRP6Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SRP6Test.java)24
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Salsa20Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Salsa20Test.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SerpentTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SerpentTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Shacal2Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Shacal2Test.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/ShortenedDigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SipHashTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SkeinDigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SkeinDigestTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SkeinMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SkeinMacTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/SkipjackTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/SkipjackTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/StreamCipherResetTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java)36
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/StreamCipherVectorTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/TEATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/TEATest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Threefish1024Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Threefish1024Test.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Threefish256Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Threefish256Test.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/Threefish512Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/Threefish512Test.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/TigerDigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/TigerDigestTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/TwofishTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/TwofishTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/VMPCKSA3Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/VMPCMacTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/VMPCMacTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/VMPCTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/VMPCTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/WhirlpoolDigestTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/XSalsa20Test.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/XSalsa20Test.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/XTEATest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/XTEATest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPListener.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPListener.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPReader.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPReader.java)26
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/KDFCounterTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFCounterTests.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackCounterTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounterTests.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java)16
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/speedy/MacThroughputTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/speedy/MacThroughputTest.java)34
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/speedy/Poly1305Reference.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/speedy/Poly1305Reference.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/speedy/ThreefishReferenceEngine.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/speedy/ThreefishReferenceEngine.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/test/speedy/ThroughputTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/test/speedy/ThroughputTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/BasicTlsTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java)32
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/DTLSClientTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/DTLSProtocolTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/DTLSServerTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/DTLSTestCase.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/HTTPSServerThread.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/KeyStores.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/KeyStores.java)4
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/LoggingDatagramTransport.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java)4
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSClient.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java)34
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSServer.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java)32
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/MockDatagramAssociation.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java)4
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsClient.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java)34
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsServer.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java)32
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/NetworkInputStream.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/NetworkOutputStream.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java)2
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsClientTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsProtocolTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsServerTest.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestCase.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java)14
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestClientImpl.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java)48
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestConfig.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java)6
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestServerImpl.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java)34
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestUtils.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java)46
-rw-r--r--core/src/test/java/org/spongycastle/crypto/tls/test/UnreliableDatagramTransport.java (renamed from core/src/test/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java)4
-rw-r--r--core/src/test/java/org/spongycastle/i18n/filter/test/HTMLFilterTest.java (renamed from core/src/test/java/org/bouncycastle/i18n/filter/test/HTMLFilterTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/i18n/filter/test/SQLFilterTest.java (renamed from core/src/test/java/org/bouncycastle/i18n/filter/test/SQLFilterTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/i18n/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/i18n/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/i18n/test/LocalizedMessageTest.java (renamed from core/src/test/java/org/bouncycastle/i18n/test/LocalizedMessageTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/ECAlgorithmsTest.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/ECPointPerformanceTest.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java)16
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/ECPointTest.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/F2mProofer.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java)12
-rw-r--r--core/src/test/java/org/spongycastle/math/ec/test/TnafTest.java (renamed from core/src/test/java/org/bouncycastle/math/ec/test/TnafTest.java)18
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/AllTests.java)6
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/BitStringTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/EncryptionKeyTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java)12
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/GMSSSignerTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java)34
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePKCSCipherTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java)22
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java)32
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureKeyTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureParametersTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignerTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java)2
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSigningParametersTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/RainbowSignerTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java)26
-rw-r--r--core/src/test/java/org/spongycastle/pqc/crypto/test/RegressionTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java)14
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java)8
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java)10
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java)4
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java (renamed from core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/AbstractCoderTest.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java)4
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/Base64Test.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/Base64Test.java)14
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/EncoderTest.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/EncoderTest.java)8
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/HexTest.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/HexTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/util/encoders/test/UrlBase64Test.java (renamed from core/src/test/java/org/bouncycastle/util/encoders/test/UrlBase64Test.java)14
-rw-r--r--core/src/test/java/org/spongycastle/util/io/pem/test/AllTests.java (renamed from core/src/test/java/org/bouncycastle/util/io/pem/test/AllTests.java)8
-rw-r--r--core/src/test/java/org/spongycastle/util/io/test/BufferingOutputStreamTest.java (renamed from core/src/test/java/org/bouncycastle/util/io/test/BufferingOutputStreamTest.java)6
-rw-r--r--core/src/test/java/org/spongycastle/util/utiltest/AllTests.java (renamed from core/src/test/java/org/bouncycastle/util/utiltest/AllTests.java)2
-rw-r--r--core/src/test/java/org/spongycastle/util/utiltest/BigIntegersTest.java (renamed from core/src/test/java/org/bouncycastle/util/utiltest/BigIntegersTest.java)10
-rw-r--r--core/src/test/java/org/spongycastle/util/utiltest/IPTest.java (renamed from core/src/test/java/org/bouncycastle/util/utiltest/IPTest.java)4
-rw-r--r--core/src/test/javadoc/org/spongycastle/asn1/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/asn1/test/package.html)0
-rw-r--r--core/src/test/javadoc/org/spongycastle/cms/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/cms/test/package.html)2
-rw-r--r--core/src/test/javadoc/org/spongycastle/crypto/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/crypto/test/package.html)0
-rw-r--r--core/src/test/javadoc/org/spongycastle/crypto/tls/package.html (renamed from core/src/test/javadoc/org/bouncycastle/crypto/tls/package.html)0
-rw-r--r--core/src/test/javadoc/org/spongycastle/mail/smime/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/mail/smime/test/package.html)2
-rw-r--r--core/src/test/javadoc/org/spongycastle/mozilla/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/mozilla/test/package.html)0
-rw-r--r--core/src/test/javadoc/org/spongycastle/ocsp/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/ocsp/test/package.html)0
-rw-r--r--core/src/test/javadoc/org/spongycastle/openpgp/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/openpgp/test/package.html)2
-rw-r--r--core/src/test/javadoc/org/spongycastle/openssl/test/package.html (renamed from core/src/test/javadoc/org/bouncycastle/openssl/test/package.html)0
-rw-r--r--core/src/test/jdk1.1/org/spongycastle/asn1/test/RegressionTest.java (renamed from core/src/test/jdk1.2/org/bouncycastle/asn1/test/RegressionTest.java)6
-rw-r--r--core/src/test/jdk1.1/org/spongycastle/crypto/test/RegressionTest.java (renamed from core/src/test/jdk1.1/org/bouncycastle/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/jdk1.2/org/spongycastle/asn1/test/RegressionTest.java (renamed from core/src/test/jdk1.1/org/bouncycastle/asn1/test/RegressionTest.java)6
-rw-r--r--core/src/test/jdk1.2/org/spongycastle/crypto/test/RegressionTest.java (renamed from core/src/test/jdk1.2/org/bouncycastle/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/jdk1.3/org/spongycastle/crypto/test/DSATest.java (renamed from core/src/test/jdk1.3/org/bouncycastle/crypto/test/DSATest.java)38
-rw-r--r--core/src/test/jdk1.3/org/spongycastle/i18n/test/AllTests.java (renamed from core/src/test/jdk1.3/org/bouncycastle/i18n/test/AllTests.java)6
-rw-r--r--core/src/test/jdk1.4/org/spongycastle/asn1/test/AllTests.java (renamed from core/src/test/jdk1.4/org/bouncycastle/asn1/test/AllTests.java)6
-rw-r--r--core/src/test/jdk1.4/org/spongycastle/crypto/test/RegressionTest.java (renamed from core/src/test/jdk1.4/org/bouncycastle/crypto/test/RegressionTest.java)6
-rw-r--r--core/src/test/jdk1.4/org/spongycastle/pqc/crypto/test/AllTests.java (renamed from core/src/test/jdk1.4/org/bouncycastle/pqc/crypto/test/AllTests.java)6
-rw-r--r--core/src/test/resources/org/spongycastle/asn1/test/masterlist-content.data (renamed from core/src/test/resources/org/bouncycastle/asn1/test/masterlist-content.data)bin1748 -> 1748 bytes
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/SCryptTestVectors.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/SCryptTestVectors.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFCTR_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFCTR_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp (renamed from core/src/test/resources/org/bouncycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-128.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-128.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/README.txt (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/README.txt)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/ca.tmpl (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/ca.tmpl)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/client.tmpl (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/client.tmpl)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/server.tmpl (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/server.tmpl)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca-key.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca-key.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client-key.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client-key.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server-key.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server-key.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server.pem (renamed from core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server.pem)0
-rw-r--r--core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_de.properties (renamed from core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_de.properties)0
-rw-r--r--core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_en.properties (renamed from core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_en.properties)0
-rw-r--r--core/src/test/resources/org/spongycastle/i18n/test/I18nUTF8TestMessages_de.properties (renamed from core/src/test/resources/org/bouncycastle/i18n/test/I18nUTF8TestMessages_de.properties)0
372 files changed, 3101 insertions, 3101 deletions
diff --git a/core/src/test/j2me/java/math/test/BigIntegerTest.java b/core/src/test/j2me/java/math/test/BigIntegerTest.java
index 379765b0..235d695a 100644
--- a/core/src/test/j2me/java/math/test/BigIntegerTest.java
+++ b/core/src/test/j2me/java/math/test/BigIntegerTest.java
@@ -2,7 +2,7 @@ package java.math.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.util.test.*;
+import org.spongycastle.util.test.*;
public class BigIntegerTest
extends SimpleTest
diff --git a/core/src/test/j2me/java/math/test/RegressionTest.java b/core/src/test/j2me/java/math/test/RegressionTest.java
index bbfc2995..79d8b590 100644
--- a/core/src/test/j2me/java/math/test/RegressionTest.java
+++ b/core/src/test/j2me/java/math/test/RegressionTest.java
@@ -1,7 +1,7 @@
package java.math.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/j2me/org/bouncycastle/asn1/test/GeneralizedTimeTest.java b/core/src/test/j2me/org/spongycastle/asn1/test/GeneralizedTimeTest.java
index 22844c29..707fcb99 100644
--- a/core/src/test/j2me/org/bouncycastle/asn1/test/GeneralizedTimeTest.java
+++ b/core/src/test/j2me/org/spongycastle/asn1/test/GeneralizedTimeTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.util.Date;
import java.util.TimeZone;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.DERGeneralizedTime;
+import org.spongycastle.util.test.SimpleTest;
/**
* X.690 test example
diff --git a/core/src/test/j2me/org/bouncycastle/asn1/test/RegressionTest.java b/core/src/test/j2me/org/spongycastle/asn1/test/RegressionTest.java
index 54c2ea77..a559705f 100644
--- a/core/src/test/j2me/org/bouncycastle/asn1/test/RegressionTest.java
+++ b/core/src/test/j2me/org/spongycastle/asn1/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/j2me/org/bouncycastle/asn1/test/UTCTimeTest.java b/core/src/test/j2me/org/spongycastle/asn1/test/UTCTimeTest.java
index e25bd9cd..c1154f05 100644
--- a/core/src/test/j2me/org/bouncycastle/asn1/test/UTCTimeTest.java
+++ b/core/src/test/j2me/org/spongycastle/asn1/test/UTCTimeTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1UTCTime;
+import org.spongycastle.asn1.DERUTCTime;
+import org.spongycastle.util.test.SimpleTest;
/**
* X.690 test example
diff --git a/core/src/test/j2me/org/bouncycastle/crypto/test/BigIntegerTest.java b/core/src/test/j2me/org/spongycastle/crypto/test/BigIntegerTest.java
index 025f4775..ef223693 100644
--- a/core/src/test/j2me/org/bouncycastle/crypto/test/BigIntegerTest.java
+++ b/core/src/test/j2me/org/spongycastle/crypto/test/BigIntegerTest.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.*;
+import org.spongycastle.util.test.*;
public class BigIntegerTest
{
diff --git a/core/src/test/j2me/org/bouncycastle/crypto/test/CryptoRegressionTest.java b/core/src/test/j2me/org/spongycastle/crypto/test/CryptoRegressionTest.java
index 1780ac0f..e66d6270 100644
--- a/core/src/test/j2me/org/bouncycastle/crypto/test/CryptoRegressionTest.java
+++ b/core/src/test/j2me/org/spongycastle/crypto/test/CryptoRegressionTest.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.*;
+import org.spongycastle.util.test.*;
public class CryptoRegressionTest
{
diff --git a/core/src/test/j2me/org/bouncycastle/crypto/test/RSATest.java b/core/src/test/j2me/org/spongycastle/crypto/test/RSATest.java
index 2369d1c5..b0f2fc55 100644
--- a/core/src/test/j2me/org/bouncycastle/crypto/test/RSATest.java
+++ b/core/src/test/j2me/org/spongycastle/crypto/test/RSATest.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class RSATest
extends SimpleTest
diff --git a/core/src/test/j2me/org/bouncycastle/crypto/test/RegressionTest.java b/core/src/test/j2me/org/spongycastle/crypto/test/RegressionTest.java
index f8d37aaa..d1a1f786 100644
--- a/core/src/test/j2me/org/bouncycastle/crypto/test/RegressionTest.java
+++ b/core/src/test/j2me/org/spongycastle/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public final class RegressionTest
{
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java b/core/src/test/java/org/spongycastle/asn1/test/ASN1SequenceParserTest.java
index e0cd1af2..4c93a888 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ASN1SequenceParserTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -8,14 +8,14 @@ import java.util.Arrays;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.DERSequenceGenerator;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Null;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1SequenceParser;
+import org.spongycastle.asn1.ASN1StreamParser;
+import org.spongycastle.asn1.BERSequenceGenerator;
+import org.spongycastle.asn1.DERSequenceGenerator;
+import org.spongycastle.util.encoders.Hex;
public class ASN1SequenceParserTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ASN1UnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/ASN1UnitTest.java
index d51cc6af..e71aedc1 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ASN1UnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ASN1UnitTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.util.test.SimpleTest;
import java.math.BigInteger;
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java
index baf0750f..b1aa29bb 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
-import org.bouncycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
+import org.spongycastle.asn1.x500.DirectoryString;
public class AdditionalInformationSyntaxUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/AdmissionSyntaxUnitTest.java
index ad0e9259..b87cb83d 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/AdmissionSyntaxUnitTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.isismtt.x509.AdmissionSyntax;
+import org.spongycastle.asn1.isismtt.x509.Admissions;
+import org.spongycastle.asn1.isismtt.x509.NamingAuthority;
+import org.spongycastle.asn1.isismtt.x509.ProfessionInfo;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.X509Name;
public class AdmissionSyntaxUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/AdmissionsUnitTest.java
index 171faec4..e9bf4906 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/AdmissionsUnitTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.isismtt.x509.Admissions;
+import org.spongycastle.asn1.isismtt.x509.NamingAuthority;
+import org.spongycastle.asn1.isismtt.x509.ProfessionInfo;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.X509Name;
public class AdmissionsUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AllTests.java b/core/src/test/java/org/spongycastle/asn1/test/AllTests.java
index 5b647b3e..6e1c6dde 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testASN1()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/AttributeTableUnitTest.java
index 337fb1a5..ec541032 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/AttributeTableUnitTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.util.Hashtable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.cms.Attribute;
+import org.spongycastle.asn1.cms.AttributeTable;
+import org.spongycastle.util.test.SimpleTest;
public class AttributeTableUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/BiometricDataUnitTest.java
index b4c2ea42..97058495 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/BiometricDataUnitTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.security.SecureRandom;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.qualified.BiometricData;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.qualified.BiometricData;
+import org.spongycastle.asn1.x509.qualified.TypeOfBiometricData;
+import org.spongycastle.util.test.SimpleTest;
public class BiometricDataUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/BitStringConstantTester.java b/core/src/test/java/org/spongycastle/asn1/test/BitStringConstantTester.java
index bbea4a3d..ad036d9e 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/BitStringConstantTester.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/BitStringConstantTester.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
public class BitStringConstantTester
{
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/BitStringTest.java b/core/src/test/java/org/spongycastle/asn1/test/BitStringTest.java
index 1cd5bd3a..ff7cd387 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/BitStringTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/BitStringTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.x509.KeyUsage;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class BitStringTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CMSTest.java b/core/src/test/java/org/spongycastle/asn1/test/CMSTest.java
index 873b27c0..8fb342c8 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CMSTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CMSTest.java
@@ -1,34 +1,34 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.EncryptedContentInfoParser;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.cms.EnvelopedDataParser;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetStringParser;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1SequenceParser;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1SetParser;
+import org.spongycastle.asn1.ASN1StreamParser;
+import org.spongycastle.asn1.BERTags;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.cms.CMSObjectIdentifiers;
+import org.spongycastle.asn1.cms.CompressedData;
+import org.spongycastle.asn1.cms.ContentInfo;
+import org.spongycastle.asn1.cms.ContentInfoParser;
+import org.spongycastle.asn1.cms.EncryptedContentInfoParser;
+import org.spongycastle.asn1.cms.EnvelopedData;
+import org.spongycastle.asn1.cms.EnvelopedDataParser;
+import org.spongycastle.asn1.cms.KEKRecipientInfo;
+import org.spongycastle.asn1.cms.KeyTransRecipientInfo;
+import org.spongycastle.asn1.cms.RecipientInfo;
+import org.spongycastle.asn1.cms.SignedData;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.io.Streams;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class CMSTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/CertHashUnitTest.java
index 62c81d45..283d64f2 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CertHashUnitTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.ocsp.CertHash;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.isismtt.ocsp.CertHash;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
public class CertHashUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CertificateTest.java b/core/src/test/java/org/spongycastle/asn1/test/CertificateTest.java
index 1eebd195..bfdba438 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CertificateTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CertificateTest.java
@@ -1,37 +1,37 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.AttCertValidityPeriod;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.AttributeCertificateInfo;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.Holder;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.AttCertIssuer;
+import org.spongycastle.asn1.x509.AttCertValidityPeriod;
+import org.spongycastle.asn1.x509.Attribute;
+import org.spongycastle.asn1.x509.AttributeCertificate;
+import org.spongycastle.asn1.x509.AttributeCertificateInfo;
+import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.DistributionPoint;
+import org.spongycastle.asn1.x509.ExtendedKeyUsage;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.Holder;
+import org.spongycastle.asn1.x509.KeyPurposeId;
+import org.spongycastle.asn1.x509.KeyUsage;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
+import org.spongycastle.asn1.x509.TBSCertificate;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class CertificateTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
index 0ce1c236..321e1f72 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
-import org.bouncycastle.asn1.esf.CommitmentTypeIndication;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.esf.CommitmentTypeIdentifier;
+import org.spongycastle.asn1.esf.CommitmentTypeIndication;
+import org.spongycastle.util.test.SimpleTest;
public class CommitmentTypeIndicationUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
index 2d782ba9..9e3a0abf 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
-import org.bouncycastle.asn1.esf.CommitmentTypeQualifier;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.esf.CommitmentTypeIdentifier;
+import org.spongycastle.asn1.esf.CommitmentTypeQualifier;
+import org.spongycastle.util.test.SimpleTest;
public class CommitmentTypeQualifierUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/ContentHintsUnitTest.java
index 1ae15e7b..b0610f64 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ContentHintsUnitTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.ess.ContentHints;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.ess.ContentHints;
public class ContentHintsUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/CscaMasterListTest.java b/core/src/test/java/org/spongycastle/asn1/test/CscaMasterListTest.java
index c8700697..30c82cdf 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/CscaMasterListTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/CscaMasterListTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.icao.CscaMasterList;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.icao.CscaMasterList;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.io.Streams;
+import org.spongycastle.util.test.SimpleTest;
public class CscaMasterListTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java b/core/src/test/java/org/spongycastle/asn1/test/DERApplicationSpecificTest.java
index 2e047dee..f17179ee 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/DERApplicationSpecificTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.BERTags;
+import org.spongycastle.asn1.DERApplicationSpecific;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class DERApplicationSpecificTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java b/core/src/test/java/org/spongycastle/asn1/test/DERUTF8StringTest.java
index 7e38d7da..bd284b66 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/DERUTF8StringTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.asn1.test;
+
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class DERUTF8StringTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/DataGroupHashUnitTest.java
index 85f01e98..86d0c4c8 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/DataGroupHashUnitTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import java.util.Random;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.icao.DataGroupHash;
+import org.spongycastle.util.test.SimpleTest;
public class DataGroupHashUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/DeclarationOfMajorityUnitTest.java
index cd42340c..ec0d3974 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/DeclarationOfMajorityUnitTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.isismtt.x509.DeclarationOfMajority;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.isismtt.x509.DeclarationOfMajority;
public class DeclarationOfMajorityUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/ESSCertIDv2UnitTest.java
index e8978cad..a9f6e344 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ESSCertIDv2UnitTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ess.ESSCertIDv2;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
public class ESSCertIDv2UnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java b/core/src/test/java/org/spongycastle/asn1/test/EncryptedPrivateKeyInfoTest.java
index f4732cf2..a02a166e 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/EncryptedPrivateKeyInfoTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.util.ASN1Dump;
-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.DEROutputStream;
+import org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test the reading and writing of EncryptedPrivateKeyInfo objects using
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/EnumeratedTest.java b/core/src/test/java/org/spongycastle/asn1/test/EnumeratedTest.java
index c1c3b3bf..90391ef5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/EnumeratedTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/EnumeratedTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Boolean;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.util.encoders.Hex;
/**
* Tests used to verify correct decoding of the ENUMERATED type.
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java b/core/src/test/java/org/spongycastle/asn1/test/EqualsAndHashCodeTest.java
index 3da4e6ad..1993d016 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/EqualsAndHashCodeTest.java
@@ -1,41 +1,41 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.util.Date;
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERConstructedOctetString;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1Boolean;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.BERConstructedOctetString;
+import org.spongycastle.asn1.BERSequence;
+import org.spongycastle.asn1.BERSet;
+import org.spongycastle.asn1.BERTaggedObject;
+import org.spongycastle.asn1.DERApplicationSpecific;
+import org.spongycastle.asn1.DERBMPString;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERGeneralString;
+import org.spongycastle.asn1.DERGeneralizedTime;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DERNumericString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERT61String;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.DERUTCTime;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.DERUniversalString;
+import org.spongycastle.asn1.DERVisibleString;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class EqualsAndHashCodeTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/GeneralNameTest.java b/core/src/test/java/org/spongycastle/asn1/test/GeneralNameTest.java
index f88a83cd..dcc2e8b7 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/GeneralNameTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/GeneralNameTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class GeneralNameTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java b/core/src/test/java/org/spongycastle/asn1/test/GeneralizedTimeTest.java
index 3a86370c..3dce5b3c 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/GeneralizedTimeTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.DERGeneralizedTime;
+import org.spongycastle.util.test.SimpleTest;
/**
* X.690 test example
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/GenerationTest.java b/core/src/test/java/org/spongycastle/asn1/test/GenerationTest.java
index aa5444fb..3502c8a1 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/GenerationTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/GenerationTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -9,46 +9,46 @@ import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-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.Extensions;
-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.KeyUsage;
-import org.bouncycastle.asn1.x509.RSAPublicKeyStructure;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V1TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.V2TBSCertListGenerator;
-import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x500.X500Name;
+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.Extensions;
+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.KeyUsage;
+import org.spongycastle.asn1.x509.RSAPublicKeyStructure;
+import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.asn1.x509.TBSCertificate;
+import org.spongycastle.asn1.x509.Time;
+import org.spongycastle.asn1.x509.V1TBSCertificateGenerator;
+import org.spongycastle.asn1.x509.V2TBSCertListGenerator;
+import org.spongycastle.asn1.x509.V3TBSCertificateGenerator;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class GenerationTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/GetInstanceTest.java b/core/src/test/java/org/spongycastle/asn1/test/GetInstanceTest.java
index cda7c500..05652173 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/GetInstanceTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/GetInstanceTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.lang.reflect.Method;
import java.math.BigInteger;
@@ -6,288 +6,288 @@ import java.util.Date;
import java.util.Vector;
import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.asn1.cmp.CAKeyUpdAnnContent;
-import org.bouncycastle.asn1.cmp.CMPCertificate;
-import org.bouncycastle.asn1.cmp.CRLAnnContent;
-import org.bouncycastle.asn1.cmp.CertConfirmContent;
-import org.bouncycastle.asn1.cmp.CertOrEncCert;
-import org.bouncycastle.asn1.cmp.CertRepMessage;
-import org.bouncycastle.asn1.cmp.CertResponse;
-import org.bouncycastle.asn1.cmp.CertifiedKeyPair;
-import org.bouncycastle.asn1.cmp.Challenge;
-import org.bouncycastle.asn1.cmp.ErrorMsgContent;
-import org.bouncycastle.asn1.cmp.GenMsgContent;
-import org.bouncycastle.asn1.cmp.GenRepContent;
-import org.bouncycastle.asn1.cmp.InfoTypeAndValue;
-import org.bouncycastle.asn1.cmp.KeyRecRepContent;
-import org.bouncycastle.asn1.cmp.OOBCertHash;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIConfirmContent;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIFreeText;
-import org.bouncycastle.asn1.cmp.PKIHeader;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.asn1.cmp.PKIMessages;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cmp.POPODecKeyChallContent;
-import org.bouncycastle.asn1.cmp.POPODecKeyRespContent;
-import org.bouncycastle.asn1.cmp.PollRepContent;
-import org.bouncycastle.asn1.cmp.PollReqContent;
-import org.bouncycastle.asn1.cmp.ProtectedPart;
-import org.bouncycastle.asn1.cmp.RevAnnContent;
-import org.bouncycastle.asn1.cmp.RevDetails;
-import org.bouncycastle.asn1.cmp.RevRepContent;
-import org.bouncycastle.asn1.cmp.RevReqContent;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.Attributes;
-import org.bouncycastle.asn1.cms.AuthEnvelopedData;
-import org.bouncycastle.asn1.cms.AuthenticatedData;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedData;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.cms.Evidence;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientIdentifier;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.MetaData;
-import org.bouncycastle.asn1.cms.OriginatorIdentifierOrKey;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.cms.OriginatorPublicKey;
-import org.bouncycastle.asn1.cms.OtherKeyAttribute;
-import org.bouncycastle.asn1.cms.OtherRecipientInfo;
-import org.bouncycastle.asn1.cms.PasswordRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientEncryptedKey;
-import org.bouncycastle.asn1.cms.RecipientIdentifier;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.cms.SignerIdentifier;
-import org.bouncycastle.asn1.cms.SignerInfo;
-import org.bouncycastle.asn1.cms.TimeStampAndCRL;
-import org.bouncycastle.asn1.cms.TimeStampTokenEvidence;
-import org.bouncycastle.asn1.cms.TimeStampedData;
-import org.bouncycastle.asn1.cms.ecc.MQVuserKeyingMaterial;
-import org.bouncycastle.asn1.crmf.AttributeTypeAndValue;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.crmf.CertReqMessages;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.crmf.CertRequest;
-import org.bouncycastle.asn1.crmf.CertTemplate;
-import org.bouncycastle.asn1.crmf.Controls;
-import org.bouncycastle.asn1.crmf.EncKeyWithID;
-import org.bouncycastle.asn1.crmf.EncryptedKey;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.crmf.OptionalValidity;
-import org.bouncycastle.asn1.crmf.PKIArchiveOptions;
-import org.bouncycastle.asn1.crmf.PKIPublicationInfo;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.crmf.POPOPrivKey;
-import org.bouncycastle.asn1.crmf.POPOSigningKey;
-import org.bouncycastle.asn1.crmf.POPOSigningKeyInput;
-import org.bouncycastle.asn1.crmf.ProofOfPossession;
-import org.bouncycastle.asn1.crmf.SinglePubInfo;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.eac.CVCertificate;
-import org.bouncycastle.asn1.eac.CVCertificateRequest;
-import org.bouncycastle.asn1.eac.CertificateBody;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.asn1.eac.RSAPublicKey;
-import org.bouncycastle.asn1.eac.UnsignedInteger;
-import org.bouncycastle.asn1.esf.CommitmentTypeIndication;
-import org.bouncycastle.asn1.esf.CommitmentTypeQualifier;
-import org.bouncycastle.asn1.esf.CompleteRevocationRefs;
-import org.bouncycastle.asn1.esf.CrlIdentifier;
-import org.bouncycastle.asn1.esf.CrlListID;
-import org.bouncycastle.asn1.esf.CrlOcspRef;
-import org.bouncycastle.asn1.esf.CrlValidatedID;
-import org.bouncycastle.asn1.esf.OcspIdentifier;
-import org.bouncycastle.asn1.esf.OcspListID;
-import org.bouncycastle.asn1.esf.OcspResponsesID;
-import org.bouncycastle.asn1.esf.OtherHash;
-import org.bouncycastle.asn1.esf.OtherHashAlgAndValue;
-import org.bouncycastle.asn1.esf.OtherRevRefs;
-import org.bouncycastle.asn1.esf.OtherRevVals;
-import org.bouncycastle.asn1.esf.RevocationValues;
-import org.bouncycastle.asn1.esf.SPUserNotice;
-import org.bouncycastle.asn1.esf.SPuri;
-import org.bouncycastle.asn1.esf.SigPolicyQualifierInfo;
-import org.bouncycastle.asn1.esf.SigPolicyQualifiers;
-import org.bouncycastle.asn1.esf.SignaturePolicyId;
-import org.bouncycastle.asn1.esf.SignaturePolicyIdentifier;
-import org.bouncycastle.asn1.esf.SignerAttribute;
-import org.bouncycastle.asn1.esf.SignerLocation;
-import org.bouncycastle.asn1.ess.ContentHints;
-import org.bouncycastle.asn1.ess.ContentIdentifier;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.ess.OtherSigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificateV2;
-import org.bouncycastle.asn1.icao.CscaMasterList;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.asn1.icao.LDSSecurityObject;
-import org.bouncycastle.asn1.icao.LDSVersionInfo;
-import org.bouncycastle.asn1.isismtt.ocsp.CertHash;
-import org.bouncycastle.asn1.isismtt.ocsp.RequestedCertificate;
-import org.bouncycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.DeclarationOfMajority;
-import org.bouncycastle.asn1.isismtt.x509.MonetaryLimit;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.isismtt.x509.Restriction;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.asn1.mozilla.PublicKeyAndChallenge;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.CertID;
-import org.bouncycastle.asn1.ocsp.CertStatus;
-import org.bouncycastle.asn1.ocsp.CrlID;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
-import org.bouncycastle.asn1.ocsp.Request;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-import org.bouncycastle.asn1.ocsp.ResponseData;
-import org.bouncycastle.asn1.ocsp.RevokedInfo;
-import org.bouncycastle.asn1.ocsp.Signature;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.ocsp.TBSRequest;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PBEParameter;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.smime.SMIMECapabilities;
-import org.bouncycastle.asn1.smime.SMIMECapability;
-import org.bouncycastle.asn1.tsp.Accuracy;
-import org.bouncycastle.asn1.tsp.MessageImprint;
-import org.bouncycastle.asn1.tsp.TSTInfo;
-import org.bouncycastle.asn1.tsp.TimeStampReq;
-import org.bouncycastle.asn1.tsp.TimeStampResp;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AccessDescription;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.AttCertValidityPeriod;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.AttributeCertificateInfo;
-import org.bouncycastle.asn1.x509.AuthorityInformationAccess;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.asn1.x509.CertificatePolicies;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.DisplayText;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.asn1.x509.Holder;
-import org.bouncycastle.asn1.x509.IetfAttrSyntax;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.NameConstraints;
-import org.bouncycastle.asn1.x509.NoticeReference;
-import org.bouncycastle.asn1.x509.ObjectDigestInfo;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.PolicyMappings;
-import org.bouncycastle.asn1.x509.PolicyQualifierInfo;
-import org.bouncycastle.asn1.x509.PrivateKeyUsagePeriod;
-import org.bouncycastle.asn1.x509.RSAPublicKeyStructure;
-import org.bouncycastle.asn1.x509.RoleSyntax;
-import org.bouncycastle.asn1.x509.SubjectDirectoryAttributes;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.TBSCertificateStructure;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.UserNotice;
-import org.bouncycastle.asn1.x509.V2Form;
-import org.bouncycastle.asn1.x509.X509CertificateStructure;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x509.qualified.BiometricData;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
-import org.bouncycastle.asn1.x509.sigi.PersonalData;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.DHPublicKey;
-import org.bouncycastle.asn1.x9.DHValidationParms;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Base64;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.ASN1UTCTime;
+import org.spongycastle.asn1.DERBMPString;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERGeneralString;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DERNumericString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERT61String;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.DERUniversalString;
+import org.spongycastle.asn1.DERVisibleString;
+import org.spongycastle.asn1.cmp.CAKeyUpdAnnContent;
+import org.spongycastle.asn1.cmp.CMPCertificate;
+import org.spongycastle.asn1.cmp.CRLAnnContent;
+import org.spongycastle.asn1.cmp.CertConfirmContent;
+import org.spongycastle.asn1.cmp.CertOrEncCert;
+import org.spongycastle.asn1.cmp.CertRepMessage;
+import org.spongycastle.asn1.cmp.CertResponse;
+import org.spongycastle.asn1.cmp.CertifiedKeyPair;
+import org.spongycastle.asn1.cmp.Challenge;
+import org.spongycastle.asn1.cmp.ErrorMsgContent;
+import org.spongycastle.asn1.cmp.GenMsgContent;
+import org.spongycastle.asn1.cmp.GenRepContent;
+import org.spongycastle.asn1.cmp.InfoTypeAndValue;
+import org.spongycastle.asn1.cmp.KeyRecRepContent;
+import org.spongycastle.asn1.cmp.OOBCertHash;
+import org.spongycastle.asn1.cmp.PBMParameter;
+import org.spongycastle.asn1.cmp.PKIBody;
+import org.spongycastle.asn1.cmp.PKIConfirmContent;
+import org.spongycastle.asn1.cmp.PKIFailureInfo;
+import org.spongycastle.asn1.cmp.PKIFreeText;
+import org.spongycastle.asn1.cmp.PKIHeader;
+import org.spongycastle.asn1.cmp.PKIMessage;
+import org.spongycastle.asn1.cmp.PKIMessages;
+import org.spongycastle.asn1.cmp.PKIStatus;
+import org.spongycastle.asn1.cmp.PKIStatusInfo;
+import org.spongycastle.asn1.cmp.POPODecKeyChallContent;
+import org.spongycastle.asn1.cmp.POPODecKeyRespContent;
+import org.spongycastle.asn1.cmp.PollRepContent;
+import org.spongycastle.asn1.cmp.PollReqContent;
+import org.spongycastle.asn1.cmp.ProtectedPart;
+import org.spongycastle.asn1.cmp.RevAnnContent;
+import org.spongycastle.asn1.cmp.RevDetails;
+import org.spongycastle.asn1.cmp.RevRepContent;
+import org.spongycastle.asn1.cmp.RevReqContent;
+import org.spongycastle.asn1.cms.Attribute;
+import org.spongycastle.asn1.cms.Attributes;
+import org.spongycastle.asn1.cms.AuthEnvelopedData;
+import org.spongycastle.asn1.cms.AuthenticatedData;
+import org.spongycastle.asn1.cms.CompressedData;
+import org.spongycastle.asn1.cms.ContentInfo;
+import org.spongycastle.asn1.cms.EncryptedContentInfo;
+import org.spongycastle.asn1.cms.EncryptedData;
+import org.spongycastle.asn1.cms.EnvelopedData;
+import org.spongycastle.asn1.cms.Evidence;
+import org.spongycastle.asn1.cms.IssuerAndSerialNumber;
+import org.spongycastle.asn1.cms.KEKIdentifier;
+import org.spongycastle.asn1.cms.KEKRecipientInfo;
+import org.spongycastle.asn1.cms.KeyAgreeRecipientIdentifier;
+import org.spongycastle.asn1.cms.KeyAgreeRecipientInfo;
+import org.spongycastle.asn1.cms.KeyTransRecipientInfo;
+import org.spongycastle.asn1.cms.MetaData;
+import org.spongycastle.asn1.cms.OriginatorIdentifierOrKey;
+import org.spongycastle.asn1.cms.OriginatorInfo;
+import org.spongycastle.asn1.cms.OriginatorPublicKey;
+import org.spongycastle.asn1.cms.OtherKeyAttribute;
+import org.spongycastle.asn1.cms.OtherRecipientInfo;
+import org.spongycastle.asn1.cms.PasswordRecipientInfo;
+import org.spongycastle.asn1.cms.RecipientEncryptedKey;
+import org.spongycastle.asn1.cms.RecipientIdentifier;
+import org.spongycastle.asn1.cms.RecipientInfo;
+import org.spongycastle.asn1.cms.RecipientKeyIdentifier;
+import org.spongycastle.asn1.cms.SignerIdentifier;
+import org.spongycastle.asn1.cms.SignerInfo;
+import org.spongycastle.asn1.cms.TimeStampAndCRL;
+import org.spongycastle.asn1.cms.TimeStampTokenEvidence;
+import org.spongycastle.asn1.cms.TimeStampedData;
+import org.spongycastle.asn1.cms.ecc.MQVuserKeyingMaterial;
+import org.spongycastle.asn1.crmf.AttributeTypeAndValue;
+import org.spongycastle.asn1.crmf.CertId;
+import org.spongycastle.asn1.crmf.CertReqMessages;
+import org.spongycastle.asn1.crmf.CertReqMsg;
+import org.spongycastle.asn1.crmf.CertRequest;
+import org.spongycastle.asn1.crmf.CertTemplate;
+import org.spongycastle.asn1.crmf.Controls;
+import org.spongycastle.asn1.crmf.EncKeyWithID;
+import org.spongycastle.asn1.crmf.EncryptedKey;
+import org.spongycastle.asn1.crmf.EncryptedValue;
+import org.spongycastle.asn1.crmf.OptionalValidity;
+import org.spongycastle.asn1.crmf.PKIArchiveOptions;
+import org.spongycastle.asn1.crmf.PKIPublicationInfo;
+import org.spongycastle.asn1.crmf.PKMACValue;
+import org.spongycastle.asn1.crmf.POPOPrivKey;
+import org.spongycastle.asn1.crmf.POPOSigningKey;
+import org.spongycastle.asn1.crmf.POPOSigningKeyInput;
+import org.spongycastle.asn1.crmf.ProofOfPossession;
+import org.spongycastle.asn1.crmf.SinglePubInfo;
+import org.spongycastle.asn1.cryptopro.ECGOST3410ParamSetParameters;
+import org.spongycastle.asn1.cryptopro.GOST28147Parameters;
+import org.spongycastle.asn1.cryptopro.GOST3410ParamSetParameters;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.eac.CVCertificate;
+import org.spongycastle.asn1.eac.CVCertificateRequest;
+import org.spongycastle.asn1.eac.CertificateBody;
+import org.spongycastle.asn1.eac.PublicKeyDataObject;
+import org.spongycastle.asn1.eac.RSAPublicKey;
+import org.spongycastle.asn1.eac.UnsignedInteger;
+import org.spongycastle.asn1.esf.CommitmentTypeIndication;
+import org.spongycastle.asn1.esf.CommitmentTypeQualifier;
+import org.spongycastle.asn1.esf.CompleteRevocationRefs;
+import org.spongycastle.asn1.esf.CrlIdentifier;
+import org.spongycastle.asn1.esf.CrlListID;
+import org.spongycastle.asn1.esf.CrlOcspRef;
+import org.spongycastle.asn1.esf.CrlValidatedID;
+import org.spongycastle.asn1.esf.OcspIdentifier;
+import org.spongycastle.asn1.esf.OcspListID;
+import org.spongycastle.asn1.esf.OcspResponsesID;
+import org.spongycastle.asn1.esf.OtherHash;
+import org.spongycastle.asn1.esf.OtherHashAlgAndValue;
+import org.spongycastle.asn1.esf.OtherRevRefs;
+import org.spongycastle.asn1.esf.OtherRevVals;
+import org.spongycastle.asn1.esf.RevocationValues;
+import org.spongycastle.asn1.esf.SPUserNotice;
+import org.spongycastle.asn1.esf.SPuri;
+import org.spongycastle.asn1.esf.SigPolicyQualifierInfo;
+import org.spongycastle.asn1.esf.SigPolicyQualifiers;
+import org.spongycastle.asn1.esf.SignaturePolicyId;
+import org.spongycastle.asn1.esf.SignaturePolicyIdentifier;
+import org.spongycastle.asn1.esf.SignerAttribute;
+import org.spongycastle.asn1.esf.SignerLocation;
+import org.spongycastle.asn1.ess.ContentHints;
+import org.spongycastle.asn1.ess.ContentIdentifier;
+import org.spongycastle.asn1.ess.ESSCertID;
+import org.spongycastle.asn1.ess.ESSCertIDv2;
+import org.spongycastle.asn1.ess.OtherCertID;
+import org.spongycastle.asn1.ess.OtherSigningCertificate;
+import org.spongycastle.asn1.ess.SigningCertificate;
+import org.spongycastle.asn1.ess.SigningCertificateV2;
+import org.spongycastle.asn1.icao.CscaMasterList;
+import org.spongycastle.asn1.icao.DataGroupHash;
+import org.spongycastle.asn1.icao.LDSSecurityObject;
+import org.spongycastle.asn1.icao.LDSVersionInfo;
+import org.spongycastle.asn1.isismtt.ocsp.CertHash;
+import org.spongycastle.asn1.isismtt.ocsp.RequestedCertificate;
+import org.spongycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
+import org.spongycastle.asn1.isismtt.x509.AdmissionSyntax;
+import org.spongycastle.asn1.isismtt.x509.Admissions;
+import org.spongycastle.asn1.isismtt.x509.DeclarationOfMajority;
+import org.spongycastle.asn1.isismtt.x509.MonetaryLimit;
+import org.spongycastle.asn1.isismtt.x509.NamingAuthority;
+import org.spongycastle.asn1.isismtt.x509.ProcurationSyntax;
+import org.spongycastle.asn1.isismtt.x509.ProfessionInfo;
+import org.spongycastle.asn1.isismtt.x509.Restriction;
+import org.spongycastle.asn1.misc.CAST5CBCParameters;
+import org.spongycastle.asn1.misc.IDEACBCPar;
+import org.spongycastle.asn1.mozilla.PublicKeyAndChallenge;
+import org.spongycastle.asn1.ocsp.BasicOCSPResponse;
+import org.spongycastle.asn1.ocsp.CertID;
+import org.spongycastle.asn1.ocsp.CertStatus;
+import org.spongycastle.asn1.ocsp.CrlID;
+import org.spongycastle.asn1.ocsp.OCSPRequest;
+import org.spongycastle.asn1.ocsp.OCSPResponse;
+import org.spongycastle.asn1.ocsp.OCSPResponseStatus;
+import org.spongycastle.asn1.ocsp.Request;
+import org.spongycastle.asn1.ocsp.ResponderID;
+import org.spongycastle.asn1.ocsp.ResponseBytes;
+import org.spongycastle.asn1.ocsp.ResponseData;
+import org.spongycastle.asn1.ocsp.RevokedInfo;
+import org.spongycastle.asn1.ocsp.Signature;
+import org.spongycastle.asn1.ocsp.SingleResponse;
+import org.spongycastle.asn1.ocsp.TBSRequest;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.AuthenticatedSafe;
+import org.spongycastle.asn1.pkcs.CertificationRequest;
+import org.spongycastle.asn1.pkcs.CertificationRequestInfo;
+import org.spongycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.MacData;
+import org.spongycastle.asn1.pkcs.PBEParameter;
+import org.spongycastle.asn1.pkcs.PBES2Parameters;
+import org.spongycastle.asn1.pkcs.PBKDF2Params;
+import org.spongycastle.asn1.pkcs.PKCS12PBEParams;
+import org.spongycastle.asn1.pkcs.Pfx;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.RC2CBCParameter;
+import org.spongycastle.asn1.pkcs.RSAESOAEPparams;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.pkcs.SafeBag;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.asn1.sec.ECPrivateKey;
+import org.spongycastle.asn1.smime.SMIMECapabilities;
+import org.spongycastle.asn1.smime.SMIMECapability;
+import org.spongycastle.asn1.tsp.Accuracy;
+import org.spongycastle.asn1.tsp.MessageImprint;
+import org.spongycastle.asn1.tsp.TSTInfo;
+import org.spongycastle.asn1.tsp.TimeStampReq;
+import org.spongycastle.asn1.tsp.TimeStampResp;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x500.RDN;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.AccessDescription;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.AttCertIssuer;
+import org.spongycastle.asn1.x509.AttCertValidityPeriod;
+import org.spongycastle.asn1.x509.AttributeCertificate;
+import org.spongycastle.asn1.x509.AttributeCertificateInfo;
+import org.spongycastle.asn1.x509.AuthorityInformationAccess;
+import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLNumber;
+import org.spongycastle.asn1.x509.CRLReason;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.CertificateList;
+import org.spongycastle.asn1.x509.CertificatePair;
+import org.spongycastle.asn1.x509.CertificatePolicies;
+import org.spongycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.x509.DigestInfo;
+import org.spongycastle.asn1.x509.DisplayText;
+import org.spongycastle.asn1.x509.DistributionPoint;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.ExtendedKeyUsage;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.GeneralSubtree;
+import org.spongycastle.asn1.x509.Holder;
+import org.spongycastle.asn1.x509.IetfAttrSyntax;
+import org.spongycastle.asn1.x509.IssuerSerial;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.NameConstraints;
+import org.spongycastle.asn1.x509.NoticeReference;
+import org.spongycastle.asn1.x509.ObjectDigestInfo;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.PolicyMappings;
+import org.spongycastle.asn1.x509.PolicyQualifierInfo;
+import org.spongycastle.asn1.x509.PrivateKeyUsagePeriod;
+import org.spongycastle.asn1.x509.RSAPublicKeyStructure;
+import org.spongycastle.asn1.x509.RoleSyntax;
+import org.spongycastle.asn1.x509.SubjectDirectoryAttributes;
+import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.asn1.x509.TBSCertificate;
+import org.spongycastle.asn1.x509.TBSCertificateStructure;
+import org.spongycastle.asn1.x509.Target;
+import org.spongycastle.asn1.x509.TargetInformation;
+import org.spongycastle.asn1.x509.Targets;
+import org.spongycastle.asn1.x509.Time;
+import org.spongycastle.asn1.x509.UserNotice;
+import org.spongycastle.asn1.x509.V2Form;
+import org.spongycastle.asn1.x509.X509CertificateStructure;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.x509.qualified.BiometricData;
+import org.spongycastle.asn1.x509.qualified.Iso4217CurrencyCode;
+import org.spongycastle.asn1.x509.qualified.MonetaryValue;
+import org.spongycastle.asn1.x509.qualified.QCStatement;
+import org.spongycastle.asn1.x509.qualified.SemanticsInformation;
+import org.spongycastle.asn1.x509.qualified.TypeOfBiometricData;
+import org.spongycastle.asn1.x509.sigi.NameOrPseudonym;
+import org.spongycastle.asn1.x509.sigi.PersonalData;
+import org.spongycastle.asn1.x9.DHDomainParameters;
+import org.spongycastle.asn1.x9.DHPublicKey;
+import org.spongycastle.asn1.x9.DHValidationParms;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.encoders.Base64;
public class GetInstanceTest
extends TestCase
@@ -494,7 +494,7 @@ public class GetInstanceTest
CertOrEncCert.getInstance(null);
CertRepMessage.getInstance(null);
doFullGetInstanceTest(CertResponse.class, new CertResponse(new ASN1Integer(1), new PKIStatusInfo(PKIStatus.granted)));
- doFullGetInstanceTest(org.bouncycastle.asn1.cmp.CertStatus.class, new org.bouncycastle.asn1.cmp.CertStatus(new byte[10], BigInteger.valueOf(1), new PKIStatusInfo(PKIStatus.granted)));
+ doFullGetInstanceTest(org.spongycastle.asn1.cmp.CertStatus.class, new org.spongycastle.asn1.cmp.CertStatus(new byte[10], BigInteger.valueOf(1), new PKIStatusInfo(PKIStatus.granted)));
doFullGetInstanceTest(Challenge.class, new Challenge(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), new byte[10], new byte[10]));
doFullGetInstanceTest(CMPCertificate.class, cmpCert);
@@ -645,7 +645,7 @@ public class GetInstanceTest
doFullGetInstanceTest(SignaturePolicyIdentifier.class, new SignaturePolicyIdentifier());
doFullGetInstanceTest(SignaturePolicyIdentifier.class, new SignaturePolicyIdentifier(signaturePolicyId));
doFullGetInstanceTest(SignaturePolicyId.class, signaturePolicyId);
- doFullGetInstanceTest(SignerAttribute.class, new SignerAttribute(new org.bouncycastle.asn1.x509.Attribute[]{new org.bouncycastle.asn1.x509.Attribute(new ASN1ObjectIdentifier("1.2.1"), new DERSet())}));
+ doFullGetInstanceTest(SignerAttribute.class, new SignerAttribute(new org.spongycastle.asn1.x509.Attribute[]{new org.spongycastle.asn1.x509.Attribute(new ASN1ObjectIdentifier("1.2.1"), new DERSet())}));
doFullGetInstanceTest(SignerAttribute.class, new SignerAttribute(attributeCert));
ASN1EncodableVector postalAddr = new ASN1EncodableVector();
@@ -661,7 +661,7 @@ public class GetInstanceTest
v.add(Integers.valueOf(1));
v.add(BigInteger.valueOf(2));
- NoticeReference noticeReference = new NoticeReference("BC", v);
+ NoticeReference noticeReference = new NoticeReference("SC", v);
doFullGetInstanceTest(SPUserNotice.class, new SPUserNotice(noticeReference, new DisplayText("hello world")));
ContentHints.getInstance(null);
ContentIdentifier.getInstance(null);
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/InputStreamTest.java b/core/src/test/java/org/spongycastle/asn1/test/InputStreamTest.java
index 819d285f..000455d8 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/InputStreamTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/InputStreamTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.util.test.SimpleTest;
public class InputStreamTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java
index 9a1d6a87..1c197804 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.qualified.Iso4217CurrencyCode;
+import org.spongycastle.util.test.SimpleTest;
public class Iso4217CurrencyCodeUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/IssuingDistributionPointUnitTest.java
index 3f27f191..6453d707 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/IssuingDistributionPointUnitTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.ReasonFlags;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.ReasonFlags;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.util.test.SimpleTest;
public class IssuingDistributionPointUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/KeyUsageTest.java b/core/src/test/java/org/spongycastle/asn1/test/KeyUsageTest.java
index f5c90cd0..2de2f3d5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/KeyUsageTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/KeyUsageTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.x509.KeyUsage;
+import org.spongycastle.util.test.SimpleTest;
public class KeyUsageTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/LDSSecurityObjectUnitTest.java
index 3c7cd5fc..0cbb4476 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/LDSSecurityObjectUnitTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import java.util.Random;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.asn1.icao.LDSSecurityObject;
-import org.bouncycastle.asn1.icao.LDSVersionInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.icao.DataGroupHash;
+import org.spongycastle.asn1.icao.LDSSecurityObject;
+import org.spongycastle.asn1.icao.LDSVersionInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.util.test.SimpleTest;
public class LDSSecurityObjectUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/MiscTest.java b/core/src/test/java/org/spongycastle/asn1/test/MiscTest.java
index 2a5f09a7..3f127479 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/MiscTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/MiscTest.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.asn1.misc.NetscapeRevocationURL;
-import org.bouncycastle.asn1.misc.VerisignCzagExtension;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.misc.CAST5CBCParameters;
+import org.spongycastle.asn1.misc.IDEACBCPar;
+import org.spongycastle.asn1.misc.NetscapeCertType;
+import org.spongycastle.asn1.misc.NetscapeRevocationURL;
+import org.spongycastle.asn1.misc.VerisignCzagExtension;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class MiscTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/MonetaryLimitUnitTest.java
index 8456661a..02a59b4b 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/MonetaryLimitUnitTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.MonetaryLimit;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.isismtt.x509.MonetaryLimit;
import java.io.IOException;
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/MonetaryValueUnitTest.java
index dd564693..541dc497 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/MonetaryValueUnitTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.qualified.Iso4217CurrencyCode;
+import org.spongycastle.asn1.x509.qualified.MonetaryValue;
+import org.spongycastle.util.test.SimpleTest;
public class MonetaryValueUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/NameOrPseudonymUnitTest.java
index 3fbaa10a..fdab08f6 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/NameOrPseudonymUnitTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x509.sigi.NameOrPseudonym;
public class NameOrPseudonymUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/NamingAuthorityUnitTest.java
index 8dfcf8cd..cf6d5a37 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/NamingAuthorityUnitTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.isismtt.x509.NamingAuthority;
+import org.spongycastle.asn1.x500.DirectoryString;
public class NamingAuthorityUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java b/core/src/test/java/org/spongycastle/asn1/test/NetscapeCertTypeTest.java
index e5aa96ec..9d3b0993 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/NetscapeCertTypeTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.misc.NetscapeCertType;
+import org.spongycastle.util.test.SimpleTest;
public class NetscapeCertTypeTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OCSPTest.java b/core/src/test/java/org/spongycastle/asn1/test/OCSPTest.java
index ae1b035a..15b330ce 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OCSPTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/OCSPTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.ocsp.BasicOCSPResponse;
+import org.spongycastle.asn1.ocsp.OCSPRequest;
+import org.spongycastle.asn1.ocsp.OCSPResponse;
+import org.spongycastle.asn1.ocsp.ResponseBytes;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class OCSPTest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java b/core/src/test/java/org/spongycastle/asn1/test/OIDTest.java
index fa5aa61b..bc5a287c 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OIDTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/OIDTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java b/core/src/test/java/org/spongycastle/asn1/test/ObjectIdentifierTest.java
index bd665ecd..ed0a6023 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ObjectIdentifierTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.util.test.TestResult;
public class ObjectIdentifierTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java b/core/src/test/java/org/spongycastle/asn1/test/OctetStringTest.java
index 68ed5da5..ea20d91c 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OctetStringTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/OctetStringTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -7,18 +7,18 @@ import java.io.OutputStream;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BEROctetStringGenerator;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSequenceGenerator;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CompressedDataParser;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetStringParser;
+import org.spongycastle.asn1.ASN1SequenceParser;
+import org.spongycastle.asn1.ASN1StreamParser;
+import org.spongycastle.asn1.BEROctetStringGenerator;
+import org.spongycastle.asn1.BERSequenceGenerator;
+import org.spongycastle.asn1.BERTags;
+import org.spongycastle.asn1.DERSequenceGenerator;
+import org.spongycastle.asn1.cms.CMSObjectIdentifiers;
+import org.spongycastle.asn1.cms.CompressedDataParser;
+import org.spongycastle.asn1.cms.ContentInfoParser;
public class OctetStringTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/OtherCertIDUnitTest.java
index 9a85ceac..2e6a3b23 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/OtherCertIDUnitTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ess.OtherCertID;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.IssuerSerial;
+import org.spongycastle.asn1.x509.X509Name;
public class OtherCertIDUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/OtherSigningCertificateUnitTest.java
index 9de12ee8..96c67256 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/OtherSigningCertificateUnitTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.ess.OtherSigningCertificate;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ess.OtherCertID;
+import org.spongycastle.asn1.ess.OtherSigningCertificate;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
public class OtherSigningCertificateUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/PKCS10Test.java b/core/src/test/java/org/spongycastle/asn1/test/PKCS10Test.java
index da6571d2..5aaff0bb 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/PKCS10Test.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/PKCS10Test.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.pkcs.CertificationRequest;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class PKCS10Test
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/PKCS12Test.java b/core/src/test/java/org/spongycastle/asn1/test/PKCS12Test.java
index f533a652..0ad0a26e 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/PKCS12Test.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/PKCS12Test.java
@@ -1,27 +1,27 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.DLSequence;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.EncryptedData;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.BEROctetString;
+import org.spongycastle.asn1.DLSequence;
+import org.spongycastle.asn1.pkcs.AuthenticatedSafe;
+import org.spongycastle.asn1.pkcs.ContentInfo;
+import org.spongycastle.asn1.pkcs.EncryptedData;
+import org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.MacData;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.Pfx;
+import org.spongycastle.asn1.pkcs.SafeBag;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DigestInfo;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class PKCS12Test
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java b/core/src/test/java/org/spongycastle/asn1/test/PKIFailureInfoTest.java
index 164f5a6f..b4b52744 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/PKIFailureInfoTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.cmp.PKIFailureInfo;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
/**
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ParseTest.java b/core/src/test/java/org/spongycastle/asn1/test/ParseTest.java
index 2e5112a3..f2ba1770 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ParseTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ParseTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.EncryptedContentInfoParser;
-import org.bouncycastle.asn1.cms.EnvelopedDataParser;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.io.Streams;
+import org.spongycastle.asn1.ASN1OctetStringParser;
+import org.spongycastle.asn1.ASN1SequenceParser;
+import org.spongycastle.asn1.ASN1StreamParser;
+import org.spongycastle.asn1.ASN1TaggedObjectParser;
+import org.spongycastle.asn1.BERTags;
+import org.spongycastle.asn1.cms.ContentInfoParser;
+import org.spongycastle.asn1.cms.EncryptedContentInfoParser;
+import org.spongycastle.asn1.cms.EnvelopedDataParser;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.io.Streams;
public class ParseTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ParsingTest.java b/core/src/test/java/org/spongycastle/asn1/test/ParsingTest.java
index c5a33532..65424e22 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ParsingTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ParsingTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1StreamParser;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class ParsingTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/PersonalDataUnitTest.java
index 95a3120a..90cdcccd 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/PersonalDataUnitTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import java.math.BigInteger;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
-import org.bouncycastle.asn1.x509.sigi.PersonalData;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x509.sigi.NameOrPseudonym;
+import org.spongycastle.asn1.x509.sigi.PersonalData;
public class PersonalDataUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/ProcurationSyntaxUnitTest.java
index 32120bb2..8064bc65 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ProcurationSyntaxUnitTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.isismtt.x509.ProcurationSyntax;
+import org.spongycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.IssuerSerial;
+import org.spongycastle.asn1.x509.X509Name;
public class ProcurationSyntaxUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/ProfessionInfoUnitTest.java
index 34b33070..e0bb5dda 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ProfessionInfoUnitTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.isismtt.x509.NamingAuthority;
+import org.spongycastle.asn1.isismtt.x509.ProcurationSyntax;
+import org.spongycastle.asn1.isismtt.x509.ProfessionInfo;
+import org.spongycastle.asn1.x500.DirectoryString;
public class ProfessionInfoUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/QCStatementUnitTest.java
index d7a84a5e..9f820e2f 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/QCStatementUnitTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.asn1.x509.qualified.RFC3739QCObjectIdentifiers;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.qualified.QCStatement;
+import org.spongycastle.asn1.x509.qualified.RFC3739QCObjectIdentifiers;
+import org.spongycastle.asn1.x509.qualified.SemanticsInformation;
+import org.spongycastle.util.test.SimpleTest;
public class QCStatementUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/RFC4519Test.java b/core/src/test/java/org/spongycastle/asn1/test/RFC4519Test.java
index 8d7e1756..52e5b573 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/RFC4519Test.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/RFC4519Test.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameStyle;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.X500NameStyle;
+import org.spongycastle.asn1.x500.style.RFC4519Style;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class RFC4519Test
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java b/core/src/test/java/org/spongycastle/asn1/test/ReasonFlagsTest.java
index ebfd126f..34347914 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/ReasonFlagsTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.x509.ReasonFlags;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.x509.ReasonFlags;
+import org.spongycastle.util.test.SimpleTest;
public class ReasonFlagsTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/RegressionTest.java b/core/src/test/java/org/spongycastle/asn1/test/RegressionTest.java
index e4427294..5fa57fa9 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/RegressionTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/RequestedCertificateUnitTest.java
index b167e4e2..389f07d3 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/RequestedCertificateUnitTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.isismtt.ocsp.RequestedCertificate;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.util.encoders.Base64;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.isismtt.ocsp.RequestedCertificate;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.util.encoders.Base64;
public class RequestedCertificateUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/RestrictionUnitTest.java
index 3b11305a..582d6851 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/RestrictionUnitTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.isismtt.x509.Restriction;
-import org.bouncycastle.asn1.x500.DirectoryString;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.isismtt.x509.Restriction;
+import org.spongycastle.asn1.x500.DirectoryString;
public class RestrictionUnitTest
extends ASN1UnitTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SMIMETest.java b/core/src/test/java/org/spongycastle/asn1/test/SMIMETest.java
index 44d6b1c0..e6330386 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SMIMETest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/SMIMETest.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.smime.SMIMECapabilitiesAttribute;
-import org.bouncycastle.asn1.smime.SMIMECapability;
-import org.bouncycastle.asn1.smime.SMIMECapabilityVector;
-import org.bouncycastle.asn1.smime.SMIMEEncryptionKeyPreferenceAttribute;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERGeneralizedTime;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cms.RecipientKeyIdentifier;
+import org.spongycastle.asn1.smime.SMIMECapabilitiesAttribute;
+import org.spongycastle.asn1.smime.SMIMECapability;
+import org.spongycastle.asn1.smime.SMIMECapabilityVector;
+import org.spongycastle.asn1.smime.SMIMEEncryptionKeyPreferenceAttribute;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class SMIMETest
implements Test
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/SemanticsInformationUnitTest.java
index 3fd26db5..400d9003 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/SemanticsInformationUnitTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.x509.qualified.SemanticsInformation;
+import org.spongycastle.util.test.SimpleTest;
public class SemanticsInformationUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java b/core/src/test/java/org/spongycastle/asn1/test/SetTest.java
index 2e4fb392..51ad4b3f 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SetTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/SetTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.asn1.test;
+
+import org.spongycastle.asn1.ASN1Boolean;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.BERSet;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.util.test.SimpleTest;
/**
* Set sorting test example
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/SignerLocationUnitTest.java
index 8d2c2c06..44b1f66e 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/SignerLocationUnitTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.esf.SignerLocation;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.esf.SignerLocation;
+import org.spongycastle.util.test.SimpleTest;
public class SignerLocationUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/StringTest.java b/core/src/test/java/org/spongycastle/asn1/test/StringTest.java
index 426c06ac..acf29cf5 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/StringTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/StringTest.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.DERBMPString;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERGeneralString;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNumericString;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERT61String;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.DERUniversalString;
+import org.spongycastle.asn1.DERVisibleString;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.test.SimpleTest;
/**
* X.690 test example
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java b/core/src/test/java/org/spongycastle/asn1/test/SubjectKeyIdentifierTest.java
index 9887a31e..3aba390b 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/SubjectKeyIdentifierTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class SubjectKeyIdentifierTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/TagTest.java b/core/src/test/java/org/spongycastle/asn1/test/TagTest.java
index 90489a7d..cd497de3 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/TagTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/TagTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
import java.security.SecureRandom;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.DERApplicationSpecific;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/TargetInformationTest.java b/core/src/test/java/org/spongycastle/asn1/test/TargetInformationTest.java
index 34dc70fd..225cb4b8 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/TargetInformationTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/TargetInformationTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.Target;
+import org.spongycastle.asn1.x509.TargetInformation;
+import org.spongycastle.asn1.x509.Targets;
+import org.spongycastle.util.test.SimpleTest;
public class TargetInformationTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java b/core/src/test/java/org/spongycastle/asn1/test/TypeOfBiometricDataUnitTest.java
index add21ce3..bb971d7a 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/TypeOfBiometricDataUnitTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.qualified.TypeOfBiometricData;
+import org.spongycastle.util.test.SimpleTest;
public class TypeOfBiometricDataUnitTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/UTCTimeTest.java b/core/src/test/java/org/spongycastle/asn1/test/UTCTimeTest.java
index 8067e78c..b28fb0e3 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/UTCTimeTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/UTCTimeTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.DERUTCTime;
+import org.spongycastle.util.test.SimpleTest;
import java.text.SimpleDateFormat;
import java.util.SimpleTimeZone;
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/X500NameTest.java b/core/src/test/java/org/spongycastle/asn1/test/X500NameTest.java
index 32cf60fb..09a597d3 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/X500NameTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/X500NameTest.java
@@ -1,35 +1,35 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStrictStyle;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x500.style.IETFUtils;
-import org.bouncycastle.asn1.x509.X509DefaultEntryConverter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERTaggedObject;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.x500.RDN;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.X500NameBuilder;
+import org.spongycastle.asn1.x500.style.BCStrictStyle;
+import org.spongycastle.asn1.x500.style.BCStyle;
+import org.spongycastle.asn1.x500.style.IETFUtils;
+import org.spongycastle.asn1.x509.X509DefaultEntryConverter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class X500NameTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java b/core/src/test/java/org/spongycastle/asn1/test/X509ExtensionsTest.java
index 008d4d8c..af99668f 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/X509ExtensionsTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509ExtensionsGenerator;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509ExtensionsGenerator;
+import org.spongycastle.util.test.SimpleTest;
public class X509ExtensionsTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java b/core/src/test/java/org/spongycastle/asn1/test/X509NameTest.java
index f1ae757d..e67d47a0 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/X509NameTest.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/X509NameTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -6,28 +6,28 @@ import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x509.X509DefaultEntryConverter;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.X500NameBuilder;
+import org.spongycastle.asn1.x500.style.BCStyle;
+import org.spongycastle.asn1.x509.X509DefaultEntryConverter;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class X509NameTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/X9Test.java b/core/src/test/java/org/spongycastle/asn1/test/X9Test.java
index 79f5fc56..8c90e7ba 100644
--- a/core/src/test/java/org/bouncycastle/asn1/test/X9Test.java
+++ b/core/src/test/java/org/spongycastle/asn1/test/X9Test.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import java.math.BigInteger;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962NamedCurves;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ECPoint;
-import org.bouncycastle.asn1.x9.X9IntegerConverter;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.sec.ECPrivateKey;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962NamedCurves;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.asn1.x9.X9ECPoint;
+import org.spongycastle.asn1.x9.X9IntegerConverter;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
public class X9Test
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/agreement/test/AllTests.java b/core/src/test/java/org/spongycastle/crypto/agreement/test/AllTests.java
index cb5a862b..25c42874 100644
--- a/core/src/test/java/org/bouncycastle/crypto/agreement/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/agreement/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.agreement.test;
+package org.spongycastle.crypto.agreement.test;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEParticipantTest.java
index c6ecba22..223057fc 100644
--- a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEParticipantTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.agreement.test;
+package org.spongycastle.crypto.agreement.test;
import java.math.BigInteger;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEParticipant;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound1Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound2Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound3Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEUtil;
-import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.agreement.jpake.JPAKEParticipant;
+import org.spongycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
+import org.spongycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
+import org.spongycastle.crypto.agreement.jpake.JPAKERound1Payload;
+import org.spongycastle.crypto.agreement.jpake.JPAKERound2Payload;
+import org.spongycastle.crypto.agreement.jpake.JPAKERound3Payload;
+import org.spongycastle.crypto.agreement.jpake.JPAKEUtil;
+import org.spongycastle.crypto.digests.SHA256Digest;
public class JPAKEParticipantTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java
index 7d22f16a..b02a8f6c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.agreement.test;
+package org.spongycastle.crypto.agreement.test;
import java.math.BigInteger;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
public class JPAKEPrimeOrderGroupTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEUtilTest.java
index 20268b8d..beaa2be0 100644
--- a/core/src/test/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/agreement/test/JPAKEUtilTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.agreement.test;
+package org.spongycastle.crypto.agreement.test;
import java.math.BigInteger;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEUtil;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
+import org.spongycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
+import org.spongycastle.crypto.agreement.jpake.JPAKEUtil;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
public class JPAKEUtilTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/ec/test/AllTests.java b/core/src/test/java/org/spongycastle/crypto/ec/test/AllTests.java
index ba75c06b..5186f4b2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/ec/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/ec/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.ec.test;
+package org.spongycastle.crypto.ec.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testCrypto()
{
- org.bouncycastle.util.test.Test[] tests = { new ECElGamalTest(), new ECTransformationTest() };
+ org.spongycastle.util.test.Test[] tests = { new ECElGamalTest(), new ECTransformationTest() };
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java b/core/src/test/java/org/spongycastle/crypto/ec/test/ECElGamalTest.java
index 629c1a43..2b8341c9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/ec/test/ECElGamalTest.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.crypto.ec.test;
+package org.spongycastle.crypto.ec.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.ec.ECDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalEncryptor;
-import org.bouncycastle.crypto.ec.ECEncryptor;
-import org.bouncycastle.crypto.ec.ECPair;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.ec.ECDecryptor;
+import org.spongycastle.crypto.ec.ECElGamalDecryptor;
+import org.spongycastle.crypto.ec.ECElGamalEncryptor;
+import org.spongycastle.crypto.ec.ECEncryptor;
+import org.spongycastle.crypto.ec.ECPair;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class ECElGamalTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java b/core/src/test/java/org/spongycastle/crypto/ec/test/ECTransformationTest.java
index 96ada144..3b6e64e1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/ec/test/ECTransformationTest.java
@@ -1,28 +1,28 @@
-package org.bouncycastle.crypto.ec.test;
+package org.spongycastle.crypto.ec.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.ec.ECDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalEncryptor;
-import org.bouncycastle.crypto.ec.ECEncryptor;
-import org.bouncycastle.crypto.ec.ECNewPublicKeyTransform;
-import org.bouncycastle.crypto.ec.ECNewRandomnessTransform;
-import org.bouncycastle.crypto.ec.ECPair;
-import org.bouncycastle.crypto.ec.ECPairTransform;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.ec.ECDecryptor;
+import org.spongycastle.crypto.ec.ECElGamalDecryptor;
+import org.spongycastle.crypto.ec.ECElGamalEncryptor;
+import org.spongycastle.crypto.ec.ECEncryptor;
+import org.spongycastle.crypto.ec.ECNewPublicKeyTransform;
+import org.spongycastle.crypto.ec.ECNewRandomnessTransform;
+import org.spongycastle.crypto.ec.ECPair;
+import org.spongycastle.crypto.ec.ECPairTransform;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECKeyGenerationParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class ECTransformationTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/AllTests.java b/core/src/test/java/org/spongycastle/crypto/prng/test/AllTests.java
index 4c0504f8..61a17dd4 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testCrypto()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/CTRDRBGTest.java
index ca555c18..0a4d09db 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/CTRDRBGTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.prng.drbg.CTRSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.prng.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.params.DESedeParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.prng.drbg.CTRSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.SP80090DRBG;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* CTR DRBG Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java b/core/src/test/java/org/spongycastle/crypto/prng/test/DRBGTestVector.java
index dd6801c5..b0dd3b72 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/DRBGTestVector.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
import java.util.ArrayList;
import java.util.List;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.prng.EntropySource;
+import org.spongycastle.util.encoders.Hex;
public class DRBGTestVector
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/DualECDRBGTest.java
index d6c26307..4aa85708 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/DualECDRBGTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.prng.drbg.DualECSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.prng.drbg.DualECSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.SP80090DRBG;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Dual EC SP800-90 DRBG test
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/FixedSecureRandomTest.java
index 24fc238a..b10ad367 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/FixedSecureRandomTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.crypto.prng.FixedSecureRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.prng.FixedSecureRandom;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class FixedSecureRandomTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/HMacDRBGTest.java
index add77d5a..cfbd386d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/HMacDRBGTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.prng.drbg.HMacSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.prng.drbg.HMacSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.SP80090DRBG;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* HMAC SP800-90 DRBG
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/HashDRBGTest.java
index ee632033..294ae72c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/HashDRBGTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.prng.drbg.HashSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.prng.drbg.HashSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.SP80090DRBG;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* DRBG Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/RegressionTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/RegressionTest.java
index 7539f380..4c16e89d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/RegressionTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java b/core/src/test/java/org/spongycastle/crypto/prng/test/SP800RandomTest.java
index a164f8fc..ce37d5b6 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/SP800RandomTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.prng.SP800SecureRandomBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.prng.SP800SecureRandomBuilder;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class SP800RandomTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java b/core/src/test/java/org/spongycastle/crypto/prng/test/TestEntropySourceProvider.java
index 64e75958..d630f4c9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java
+++ b/core/src/test/java/org/spongycastle/crypto/prng/test/TestEntropySourceProvider.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.prng.test;
+package org.spongycastle.crypto.prng.test;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.crypto.prng.EntropySourceProvider;
+import org.spongycastle.crypto.prng.EntropySource;
+import org.spongycastle.crypto.prng.EntropySourceProvider;
public class TestEntropySourceProvider
implements EntropySourceProvider
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AEADTestUtil.java b/core/src/test/java/org/spongycastle/crypto/test/AEADTestUtil.java
index 5ffa72a1..e2ff7e4c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AEADTestUtil.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AEADTestUtil.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestFailedException;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.OutputLengthException;
+import org.spongycastle.crypto.modes.AEADBlockCipher;
+import org.spongycastle.crypto.params.AEADParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestFailedException;
public class AEADTestUtil
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESFastTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESFastTest.java
index c94b1182..6892ed77 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESFastTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESFastTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from the NIST standard tests and Brian Gladman's vector set
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESLightTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESLightTest.java
index 5e989f42..a3c4ca53 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESLightTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESLightTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.AESLightEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from the NIST standard tests and Brian Gladman's vector set
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESTest.java
index 84be7dee..243d9e8b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESTest.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.modes.SICBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from the NIST standard tests and Brian Gladman's vector set
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESVectorFileTest.java
index cfd48430..504b4bd4 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESVectorFileTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESVectorFileTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.BufferedReader;
import java.io.File;
@@ -11,15 +11,15 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.AESLightEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* Test vectors from the NIST standard tests and Brian Gladman's vector set
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESWrapPadTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESWrapPadTest.java
index fcf5979f..992c4468 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESWrapPadTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESWrapPadTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.AESWrapPadEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.engines.AESWrapPadEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* This is a test harness I use because I cannot modify the BC test harness without
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AESWrapTest.java b/core/src/test/java/org/spongycastle/crypto/test/AESWrapTest.java
index f00c6ce6..38f4af70 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AESWrapTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AESWrapTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.engines.AESWrapEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* Wrap Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/AllTests.java b/core/src/test/java/org/spongycastle/crypto/test/AllTests.java
index 35bf2350..edc7b1b2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/AllTests.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testCrypto()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherMonteCarloTest.java
index 72242c58..0b08d461 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherMonteCarloTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* a basic test that takes a cipher, key parameter, and an input
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherResetTest.java
index a35835b0..9e95cfd8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherResetTest.java
@@ -1,36 +1,36 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.OpenPGPCFBBlockCipher;
-import org.bouncycastle.crypto.modes.PGPCFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.AESLightEngine;
+import org.spongycastle.crypto.engines.BlowfishEngine;
+import org.spongycastle.crypto.engines.CAST5Engine;
+import org.spongycastle.crypto.engines.CAST6Engine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.NoekeonEngine;
+import org.spongycastle.crypto.engines.RC6Engine;
+import org.spongycastle.crypto.engines.SEEDEngine;
+import org.spongycastle.crypto.engines.SerpentEngine;
+import org.spongycastle.crypto.engines.TEAEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.engines.XTEAEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.GOFBBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.modes.OpenPGPCFBBlockCipher;
+import org.spongycastle.crypto.modes.PGPCFBBlockCipher;
+import org.spongycastle.crypto.modes.SICBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test whether block ciphers implement reset contract on init, encrypt/decrypt and reset.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherVectorTest.java
index 36b729c6..322a580d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/BlockCipherVectorTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* a basic test that takes a cipher, key parameter, and an input
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/BlowfishTest.java b/core/src/test/java/org/spongycastle/crypto/test/BlowfishTest.java
index 757788ed..57e38a3e 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/BlowfishTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/BlowfishTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.BlowfishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* blowfish tester - vectors from http://www.counterpane.com/vectors.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CAST5Test.java b/core/src/test/java/org/spongycastle/crypto/test/CAST5Test.java
index c651d873..339edd48 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CAST5Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CAST5Test.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.CAST5Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* cast tester - vectors from http://www.ietf.org/rfc/rfc2144.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CAST6Test.java b/core/src/test/java/org/spongycastle/crypto/test/CAST6Test.java
index ef035a5d..bd62fd2b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CAST6Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CAST6Test.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.CAST6Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* cast6 tester - vectors from http://www.ietf.org/rfc/rfc2612.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CCMTest.java b/core/src/test/java/org/spongycastle/crypto/test/CCMTest.java
index 2bbfe2a0..92c22cd1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CCMTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CCMTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.modes.CCMBlockCipher;
+import org.spongycastle.crypto.params.AEADParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* First four test vectors from
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/CMacTest.java
index 720f8ea3..a55ad1d2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CMacTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.CMacWithIV;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.macs.CMacWithIV;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* CMAC tester - <a href="http://www.nuee.nagoya-u.ac.jp/labs/tiwata/omac/tv/omac1-tv.txt">Official Test Vectors</a>.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CTSTest.java b/core/src/test/java/org/spongycastle/crypto/test/CTSTest.java
index 28fcc201..76846193 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CTSTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CTSTest.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.OldCTSBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.SkipjackEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CTSBlockCipher;
+import org.spongycastle.crypto.modes.OldCTSBlockCipher;
+import org.spongycastle.crypto.modes.SICBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* CTS tester
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CamelliaLightTest.java b/core/src/test/java/org/spongycastle/crypto/test/CamelliaLightTest.java
index 6198ce66..71a89fba 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CamelliaLightTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CamelliaLightTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.CamelliaLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.CamelliaLightEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Camellia tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/ and RFC 3713
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CamelliaTest.java b/core/src/test/java/org/spongycastle/crypto/test/CamelliaTest.java
index e69a82ad..a3d48193 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CamelliaTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CamelliaTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.engines.CamelliaEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.util.test.TestResult;
/**
* Camellia tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/ and RFC 3713
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ChaChaTest.java b/core/src/test/java/org/spongycastle/crypto/test/ChaChaTest.java
index 45c063fe..21f24bf9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ChaChaTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ChaChaTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.ChaChaEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* ChaCha Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CipherStreamTest.java b/core/src/test/java/org/spongycastle/crypto/test/CipherStreamTest.java
index aaf20310..bc049fa2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CipherStreamTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CipherStreamTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -6,53 +6,53 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.EAXBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.BlowfishEngine;
+import org.spongycastle.crypto.engines.CAST5Engine;
+import org.spongycastle.crypto.engines.CAST6Engine;
+import org.spongycastle.crypto.engines.CamelliaEngine;
+import org.spongycastle.crypto.engines.ChaChaEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.Grain128Engine;
+import org.spongycastle.crypto.engines.Grainv1Engine;
+import org.spongycastle.crypto.engines.HC128Engine;
+import org.spongycastle.crypto.engines.HC256Engine;
+import org.spongycastle.crypto.engines.NoekeonEngine;
+import org.spongycastle.crypto.engines.RC2Engine;
+import org.spongycastle.crypto.engines.RC4Engine;
+import org.spongycastle.crypto.engines.RC6Engine;
+import org.spongycastle.crypto.engines.SEEDEngine;
+import org.spongycastle.crypto.engines.Salsa20Engine;
+import org.spongycastle.crypto.engines.SerpentEngine;
+import org.spongycastle.crypto.engines.TEAEngine;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.engines.XSalsa20Engine;
+import org.spongycastle.crypto.engines.XTEAEngine;
+import org.spongycastle.crypto.io.CipherInputStream;
+import org.spongycastle.crypto.io.CipherOutputStream;
+import org.spongycastle.crypto.io.InvalidCipherTextIOException;
+import org.spongycastle.crypto.modes.AEADBlockCipher;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CCMBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.CTSBlockCipher;
+import org.spongycastle.crypto.modes.EAXBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.modes.OCBBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.modes.SICBlockCipher;
+import org.spongycastle.crypto.paddings.PKCS7Padding;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.test.SimpleTest;
public class CipherStreamTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CipherTest.java b/core/src/test/java/org/spongycastle/crypto/test/CipherTest.java
index 407a0440..6bd4c21f 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CipherTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CipherTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.test.SimpleTest;
public abstract class CipherTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/CramerShoupTest.java b/core/src/test/java/org/spongycastle/crypto/test/CramerShoupTest.java
index e9633572..584fe9e1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/CramerShoupTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/CramerShoupTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.DHStandardGroups;
-import org.bouncycastle.crypto.engines.CramerShoupCiphertext;
-import org.bouncycastle.crypto.engines.CramerShoupCoreEngine;
-import org.bouncycastle.crypto.engines.CramerShoupCoreEngine.CramerShoupCiphertextException;
-import org.bouncycastle.crypto.generators.CramerShoupKeyPairGenerator;
-import org.bouncycastle.crypto.generators.CramerShoupParametersGenerator;
-import org.bouncycastle.crypto.params.CramerShoupKeyGenerationParameters;
-import org.bouncycastle.crypto.params.CramerShoupParameters;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.agreement.DHStandardGroups;
+import org.spongycastle.crypto.engines.CramerShoupCiphertext;
+import org.spongycastle.crypto.engines.CramerShoupCoreEngine;
+import org.spongycastle.crypto.engines.CramerShoupCoreEngine.CramerShoupCiphertextException;
+import org.spongycastle.crypto.generators.CramerShoupKeyPairGenerator;
+import org.spongycastle.crypto.generators.CramerShoupParametersGenerator;
+import org.spongycastle.crypto.params.CramerShoupKeyGenerationParameters;
+import org.spongycastle.crypto.params.CramerShoupParameters;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.test.SimpleTest;
public class CramerShoupTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DESTest.java b/core/src/test/java/org/spongycastle/crypto/test/DESTest.java
index 08056fc4..aec63ef2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DESTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DESTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.generators.DESKeyGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.generators.DESKeyGenerator;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.params.DESParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DESedeTest.java b/core/src/test/java/org/spongycastle/crypto/test/DESedeTest.java
index b14897fa..6fc4d0d0 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DESedeTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DESedeTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.DESedeWrapEngine;
-import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.DESedeWrapEngine;
+import org.spongycastle.crypto.generators.DESedeKeyGenerator;
+import org.spongycastle.crypto.params.DESedeParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/DHKEKGeneratorTest.java
index 8a83d2a3..7a675739 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DHKEKGeneratorTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKEKGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.DerivationParameters;
+import org.spongycastle.crypto.agreement.kdf.DHKDFParameters;
+import org.spongycastle.crypto.agreement.kdf.DHKEKGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* DHKEK Generator tests - from RFC 2631.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DHTest.java b/core/src/test/java/org/spongycastle/crypto/test/DHTest.java
index 862b9f25..ce78961f 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DHTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DHTest.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.DHAgreement;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DHParametersGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.agreement.DHAgreement;
+import org.spongycastle.crypto.agreement.DHBasicAgreement;
+import org.spongycastle.crypto.generators.DHBasicKeyPairGenerator;
+import org.spongycastle.crypto.generators.DHKeyPairGenerator;
+import org.spongycastle.crypto.generators.DHParametersGenerator;
+import org.spongycastle.crypto.params.DHKeyGenerationParameters;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.util.test.SimpleTest;
public class DHTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DSATest.java b/core/src/test/java/org/spongycastle/crypto/test/DSATest.java
index 02c748fa..3d91dee9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DSATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DSATest.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DSAKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.params.DSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameterGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.params.DSAValidationParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.DSAKeyPairGenerator;
+import org.spongycastle.crypto.generators.DSAParametersGenerator;
+import org.spongycastle.crypto.params.DSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameterGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.crypto.params.DSAValidationParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.DSASigner;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test based on FIPS 186-2, Appendix 5, an example of DSA, and FIPS 168-3 test vectors.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DSTU4145Test.java b/core/src/test/java/org/spongycastle/crypto/test/DSTU4145Test.java
index 2d3013d4..43d27f09 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DSTU4145Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DSTU4145Test.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSTU4145Signer;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.DSTU4145Signer;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
public class DSTU4145Test
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DeterministicDSATest.java b/core/src/test/java/org/spongycastle/crypto/test/DeterministicDSATest.java
index c47cf8e8..e5f61ec2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DeterministicDSATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DeterministicDSATest.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.nist.NISTNamedCurves;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.signers.DSASigner;
+import org.spongycastle.crypto.signers.ECDSASigner;
+import org.spongycastle.crypto.signers.HMacDSAKCalculator;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Tests are taken from RFC 6979 - "Deterministic Usage of the Digital Signature Algorithm (DSA) and Elliptic Curve Digital Signature Algorithm (ECDSA)"
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java b/core/src/test/java/org/spongycastle/crypto/test/DigestRandomNumberTest.java
index 7bcaea8a..b79eadd3 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DigestRandomNumberTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.Digest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.util.test.SimpleTest;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.crypto.prng.DigestRandomGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.Digest;
public class DigestRandomNumberTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/DigestTest.java
index db9b490e..b293ba77 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/DigestTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.EncodableDigest;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.EncodableDigest;
+import org.spongycastle.util.Memoable;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public abstract class DigestTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/EAXTest.java b/core/src/test/java/org/spongycastle/crypto/test/EAXTest.java
index 401d9fa3..38c0a685 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/EAXTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/EAXTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.EAXBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.modes.AEADBlockCipher;
+import org.spongycastle.crypto.modes.EAXBlockCipher;
+import org.spongycastle.crypto.params.AEADParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class EAXTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/ECDHKEKGeneratorTest.java
index d75b1396..46e9dca8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECDHKEKGeneratorTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.ECDHKEKGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.DerivationParameters;
+import org.spongycastle.crypto.agreement.kdf.DHKDFParameters;
+import org.spongycastle.crypto.agreement.kdf.ECDHKEKGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* ECDHKEK Generator tests.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECGOST3410Test.java b/core/src/test/java/org/spongycastle/crypto/test/ECGOST3410Test.java
index 175835cd..2d7900d9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECGOST3410Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECGOST3410Test.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECGOST3410Signer;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECKeyGenerationParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.ECGOST3410Signer;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
/**
* ECGOST3410 tests are taken from GOST R 34.10-2001.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java b/core/src/test/java/org/spongycastle/crypto/test/ECIESKeyEncapsulationTest.java
index 64d19f50..10a73411 100755
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECIESKeyEncapsulationTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.kems.ECIESKeyEncapsulation;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.sec.SECNamedCurves;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.kems.ECIESKeyEncapsulation;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECKeyGenerationParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.test.SimpleTest;
/**
* Tests for the ECIES Key Encapsulation Mechanism
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECIESTest.java b/core/src/test/java/org/spongycastle/crypto/test/ECIESTest.java
index 737cd860..98593ae6 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECIESTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECIESTest.java
@@ -1,36 +1,36 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.parsers.ECIESPublicKeyParser;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.KeyEncoder;
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.agreement.ECDHBasicAgreement;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.IESEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
+import org.spongycastle.crypto.generators.EphemeralKeyPairGenerator;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECKeyGenerationParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.IESParameters;
+import org.spongycastle.crypto.params.IESWithCipherParameters;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.parsers.ECIESPublicKeyParser;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* test for ECIES - Elliptic Curve Integrated Encryption Scheme
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECNRTest.java b/core/src/test/java/org/spongycastle/crypto/test/ECNRTest.java
index d4cf7419..5a91f05a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECNRTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECNRTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECNRSigner;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.ECNRSigner;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
/**
* ECNR tests.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ECTest.java b/core/src/test/java/org/spongycastle/crypto/test/ECTest.java
index fc11276a..01fb3304 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ECTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ECTest.java
@@ -1,32 +1,32 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECMQVBasicAgreement;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.MQVPrivateParameters;
-import org.bouncycastle.crypto.params.MQVPublicParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.nist.NISTNamedCurves;
+import org.spongycastle.asn1.sec.SECNamedCurves;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.BasicAgreement;
+import org.spongycastle.crypto.agreement.ECDHBasicAgreement;
+import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
+import org.spongycastle.crypto.agreement.ECMQVBasicAgreement;
+import org.spongycastle.crypto.generators.ECKeyPairGenerator;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECKeyGenerationParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.MQVPrivateParameters;
+import org.spongycastle.crypto.params.MQVPublicParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.ECDSASigner;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
/**
* ECDSA tests are taken from X9.62.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ElGamalTest.java b/core/src/test/java/org/spongycastle/crypto/test/ElGamalTest.java
index fb936993..08c029af 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ElGamalTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ElGamalTest.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.ElGamalEngine;
-import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator;
-import org.bouncycastle.crypto.generators.ElGamalParametersGenerator;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.engines.ElGamalEngine;
+import org.spongycastle.crypto.generators.ElGamalKeyPairGenerator;
+import org.spongycastle.crypto.generators.ElGamalParametersGenerator;
+import org.spongycastle.crypto.params.ElGamalKeyGenerationParameters;
+import org.spongycastle.crypto.params.ElGamalParameters;
+import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters;
+import org.spongycastle.crypto.params.ElGamalPublicKeyParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class ElGamalTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java b/core/src/test/java/org/spongycastle/crypto/test/EqualsHashCodeTest.java
index 1ab7cc49..3966f8e8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/EqualsHashCodeTest.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHKeyParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.DHValidationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAValidationParameters;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410ValidationParameters;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.DHKeyPairGenerator;
+import org.spongycastle.crypto.generators.ElGamalKeyPairGenerator;
+import org.spongycastle.crypto.params.DHKeyGenerationParameters;
+import org.spongycastle.crypto.params.DHKeyParameters;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.crypto.params.DHValidationParameters;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAValidationParameters;
+import org.spongycastle.crypto.params.ElGamalKeyGenerationParameters;
+import org.spongycastle.crypto.params.ElGamalKeyParameters;
+import org.spongycastle.crypto.params.ElGamalParameters;
+import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters;
+import org.spongycastle.crypto.params.ElGamalPublicKeyParameters;
+import org.spongycastle.crypto.params.GOST3410Parameters;
+import org.spongycastle.crypto.params.GOST3410ValidationParameters;
+import org.spongycastle.util.test.SimpleTest;
import java.math.BigInteger;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GCMReorderTest.java b/core/src/test/java/org/spongycastle/crypto/test/GCMReorderTest.java
index efac338f..adddcf61 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GCMReorderTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GCMReorderTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.modes.gcm.GCMExponentiator;
-import org.bouncycastle.crypto.modes.gcm.GCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables1kGCMExponentiator;
-import org.bouncycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.crypto.modes.gcm.GCMExponentiator;
+import org.spongycastle.crypto.modes.gcm.GCMMultiplier;
+import org.spongycastle.crypto.modes.gcm.Tables1kGCMExponentiator;
+import org.spongycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Pack;
+import org.spongycastle.util.encoders.Hex;
public class GCMReorderTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GCMTest.java b/core/src/test/java/org/spongycastle/crypto/test/GCMTest.java
index b34cc4e9..0a28dd18 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GCMTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GCMTest.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.gcm.BasicGCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.GCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables8kGCMMultiplier;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Times;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.modes.gcm.BasicGCMMultiplier;
+import org.spongycastle.crypto.modes.gcm.GCMMultiplier;
+import org.spongycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
+import org.spongycastle.crypto.modes.gcm.Tables8kGCMMultiplier;
+import org.spongycastle.crypto.params.AEADParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Times;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from "The Galois/Counter Mode of Operation (GCM)", McGrew/Viega, Appendix B
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/GMacTest.java
index 082aac61..6d766e3d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GMacTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors for AES-GMAC, extracted from <a
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GOST28147MacTest.java b/core/src/test/java/org/spongycastle/crypto/test/GOST28147MacTest.java
index 8faaca1a..4ed50783 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GOST28147MacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GOST28147MacTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.macs.GOST28147Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.GOST28147Engine;
+import org.spongycastle.crypto.macs.GOST28147Mac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithSBox;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* GOST 28147 MAC tester
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GOST28147Test.java b/core/src/test/java/org/spongycastle/crypto/test/GOST28147Test.java
index 8de84406..a89f2e63 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GOST28147Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GOST28147Test.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.engines.GOST28147Engine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.GOFBBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.ParametersWithSBox;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class GOST28147Test
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GOST3410Test.java b/core/src/test/java/org/spongycastle/crypto/test/GOST3410Test.java
index 17de3fee..08ce0b01 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GOST3410Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GOST3410Test.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.GOST3410KeyPairGenerator;
-import org.bouncycastle.crypto.generators.GOST3410ParametersGenerator;
-import org.bouncycastle.crypto.params.GOST3410KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.GOST3410Signer;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.NumberParsing;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.GOST3410KeyPairGenerator;
+import org.spongycastle.crypto.generators.GOST3410ParametersGenerator;
+import org.spongycastle.crypto.params.GOST3410KeyGenerationParameters;
+import org.spongycastle.crypto.params.GOST3410Parameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.GOST3410Signer;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.NumberParsing;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
import java.math.BigInteger;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/GOST3411DigestTest.java
index 45962fe7..b3121e82 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/GOST3411DigestTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.generators.PKCS5S1ParametersGenerator;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
public class GOST3411DigestTest
extends DigestTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Grain128Test.java b/core/src/test/java/org/spongycastle/crypto/test/Grain128Test.java
index afac2e0a..7ac877c1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Grain128Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Grain128Test.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.Grain128Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Grain-128 Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Grainv1Test.java b/core/src/test/java/org/spongycastle/crypto/test/Grainv1Test.java
index b76c1f27..a9847d0e 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Grainv1Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Grainv1Test.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.Grainv1Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Grain v1 Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/HCFamilyTest.java b/core/src/test/java/org/spongycastle/crypto/test/HCFamilyTest.java
index 5604d9cc..1032c443 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/HCFamilyTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/HCFamilyTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.HC128Engine;
+import org.spongycastle.crypto.engines.HC256Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* HC-128 and HC-256 Tests. Based on the test vectors in the official reference
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java b/core/src/test/java/org/spongycastle/crypto/test/HCFamilyVecTest.java
index 51247e6a..a3c954f8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/HCFamilyVecTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.HC128Engine;
+import org.spongycastle.crypto.engines.HC256Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* HC-128 and HC-256 Tests. Based on the test vectors in the official reference
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/HKDFGeneratorTest.java
index 95135174..00564eb6 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/HKDFGeneratorTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.HKDFBytesGenerator;
-import org.bouncycastle.crypto.params.HKDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.HKDFBytesGenerator;
+import org.spongycastle.crypto.params.HKDFParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* HKDF tests - vectors from RFC 5869, + 2 more, 101 and 102
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/HashCommitmentTest.java b/core/src/test/java/org/spongycastle/crypto/test/HashCommitmentTest.java
index ed83c64e..d4c1c076 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/HashCommitmentTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/HashCommitmentTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.Commitment;
-import org.bouncycastle.crypto.Committer;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.commitments.GeneralHashCommitter;
-import org.bouncycastle.crypto.commitments.HashCommitter;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Commitment;
+import org.spongycastle.crypto.Committer;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.commitments.GeneralHashCommitter;
+import org.spongycastle.crypto.commitments.HashCommitter;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class HashCommitmentTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/IDEATest.java b/core/src/test/java/org/spongycastle/crypto/test/IDEATest.java
index 64c673ee..beb0e489 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/IDEATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/IDEATest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.IDEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.IDEAEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
*/
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ISAACTest.java b/core/src/test/java/org/spongycastle/crypto/test/ISAACTest.java
index 02319a38..e2f9f124 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ISAACTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ISAACTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.ISAACEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.ISAACEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* ISAAC Test - see http://www.burtleburtle.net/bob/rand/isaacafa.html
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ISO9796Test.java b/core/src/test/java/org/spongycastle/crypto/test/ISO9796Test.java
index 88d41aaa..109696bc 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ISO9796Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ISO9796Test.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSalt;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.signers.ISO9796d2PSSSigner;
-import org.bouncycastle.crypto.signers.ISO9796d2Signer;
-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.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.RIPEMD128Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.encodings.ISO9796d1Encoding;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ParametersWithSalt;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.signers.ISO9796d2PSSSigner;
+import org.spongycastle.crypto.signers.ISO9796d2Signer;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* test vectors from ISO 9796-1 and ISO 9796-2 edition 1.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java b/core/src/test/java/org/spongycastle/crypto/test/ISO9797Alg3MacTest.java
index 96b5fc46..1a2aee97 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ISO9797Alg3MacTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.macs.ISO9797Alg3Mac;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.macs.ISO9797Alg3Mac;
+import org.spongycastle.crypto.paddings.ISO7816d4Padding;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class ISO9797Alg3MacTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/KDF1GeneratorTest.java
index 62f9997f..0671ef8b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/KDF1GeneratorTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.KDF1BytesGenerator;
-import org.bouncycastle.crypto.params.ISO18033KDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.digests.ShortenedDigest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.KDF1BytesGenerator;
+import org.spongycastle.crypto.params.ISO18033KDFParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* KDF1 tests - vectors from ISO 18033.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/KDF2GeneratorTest.java
index 84a435a6..676f22b1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/KDF2GeneratorTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.ShortenedDigest;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.params.KDFParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* KDF2 tests - vectors from ISO 18033.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/KDFCounterGeneratorTest.java
index 7078da26..3b58db2a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/KDFCounterGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
import java.io.InputStream;
@@ -6,9 +6,9 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.Charset;
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.test.cavp.CAVPReader;
+import org.spongycastle.crypto.test.cavp.KDFCounterTests;
+import org.spongycastle.util.test.SimpleTest;
public class KDFCounterGeneratorTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java
index 37aaf668..d44d1cab 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
import java.io.InputStream;
@@ -6,10 +6,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.Charset;
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFDoublePipelineCounterTests;
-import org.bouncycastle.crypto.test.cavp.KDFDoublePipelineIterationNoCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.test.cavp.CAVPReader;
+import org.spongycastle.crypto.test.cavp.KDFDoublePipelineCounterTests;
+import org.spongycastle.crypto.test.cavp.KDFDoublePipelineIterationNoCounterTests;
+import org.spongycastle.util.test.SimpleTest;
public class KDFDoublePipelineIteratorGeneratorTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/KDFFeedbackGeneratorTest.java
index 0eba7068..fa850985 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/KDFFeedbackGeneratorTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
import java.io.InputStream;
@@ -6,10 +6,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.Charset;
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFFeedbackCounterTests;
-import org.bouncycastle.crypto.test.cavp.KDFFeedbackNoCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.test.cavp.CAVPReader;
+import org.spongycastle.crypto.test.cavp.KDFFeedbackCounterTests;
+import org.spongycastle.crypto.test.cavp.KDFFeedbackNoCounterTests;
+import org.spongycastle.util.test.SimpleTest;
public class KDFFeedbackGeneratorTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MD2DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/MD2DigestTest.java
index 443ec2e0..e393f799 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MD2DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MD2DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD2Digest;
/**
* standard vector test for MD2
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MD4DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/MD4DigestTest.java
index d57a29ce..9175e2fe 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MD4DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MD4DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD4Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD4Digest;
/**
* standard vector test for MD4 from RFC 1320.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MD5DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/MD5DigestTest.java
index ab9cab27..f39944d1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MD5DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MD5DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD5Digest;
/**
* standard vector test for MD5 from "Handbook of Applied Cryptography", page 345.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MD5HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/MD5HMacTest.java
index cfce1d91..76d8e214 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MD5HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MD5HMacTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* MD5 HMac Test, test vectors from RFC 2202
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java b/core/src/test/java/org/spongycastle/crypto/test/MGF1GeneratorTest.java
index e7e99fe2..0c7a2fec 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MGF1GeneratorTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.generators.MGF1BytesGenerator;
-import org.bouncycastle.crypto.params.MGFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.ShortenedDigest;
+import org.spongycastle.crypto.generators.MGF1BytesGenerator;
+import org.spongycastle.crypto.params.MGFParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* MGF1 tests - vectors from ISO 18033 for KDF1 (equivalent).
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/MacTest.java b/core/src/test/java/org/spongycastle/crypto/test/MacTest.java
index 5b05a608..1ae2bca1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/MacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/MacTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.paddings.PKCS7Padding;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* MAC tester - vectors from
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ModeTest.java b/core/src/test/java/org/spongycastle/crypto/test/ModeTest.java
index 6619b652..19fe1932 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ModeTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ModeTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* CFB/OFB Mode test of IV padding.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/NaccacheSternTest.java b/core/src/test/java/org/spongycastle/crypto/test/NaccacheSternTest.java
index 90558558..1bde2f45 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/NaccacheSternTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/NaccacheSternTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
import java.util.Vector;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.NaccacheSternEngine;
-import org.bouncycastle.crypto.generators.NaccacheSternKeyPairGenerator;
-import org.bouncycastle.crypto.params.NaccacheSternKeyGenerationParameters;
-import org.bouncycastle.crypto.params.NaccacheSternKeyParameters;
-import org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.NaccacheSternEngine;
+import org.spongycastle.crypto.generators.NaccacheSternKeyPairGenerator;
+import org.spongycastle.crypto.params.NaccacheSternKeyGenerationParameters;
+import org.spongycastle.crypto.params.NaccacheSternKeyParameters;
+import org.spongycastle.crypto.params.NaccacheSternPrivateKeyParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test case for NaccacheStern cipher. For details on this cipher, please see
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/NoekeonTest.java b/core/src/test/java/org/spongycastle/crypto/test/NoekeonTest.java
index ebebbd64..f17ff0ff 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/NoekeonTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/NoekeonTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.NoekeonEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Noekeon tester
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/NonMemoableDigestTest.java
index d332393b..8abb0229 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/NonMemoableDigestTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.NonMemoableDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.NonMemoableDigest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA1 HMac Test, test vectors from RFC 2202
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/NullTest.java b/core/src/test/java/org/spongycastle/crypto/test/NullTest.java
index ef8ff4b5..f384cfc4 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/NullTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/NullTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.NullEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.engines.NullEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class NullTest
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/OAEPTest.java b/core/src/test/java/org/spongycastle/crypto/test/OAEPTest.java
index 9d6b0cba..30c575de 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/OAEPTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/OAEPTest.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.ByteArrayInputStream;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.pkcs.RSAPublicKey;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.asn1.pkcs.RSAPublicKey;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class OAEPTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/OCBTest.java b/core/src/test/java/org/spongycastle/crypto/test/OCBTest.java
index 26d7d124..8596e304 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/OCBTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/OCBTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Times;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.modes.AEADBlockCipher;
+import org.spongycastle.crypto.modes.OCBBlockCipher;
+import org.spongycastle.crypto.params.AEADParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Times;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from <a href="http://tools.ietf.org/html/rfc7253">RFC 7253 on The OCB
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/PKCS12Test.java b/core/src/test/java/org/spongycastle/crypto/test/PKCS12Test.java
index c5c7aa34..5374116a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/PKCS12Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/PKCS12Test.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.generators.PKCS12ParametersGenerator;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* test for PKCS12 key generation - vectors from
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/PKCS5Test.java b/core/src/test/java/org/spongycastle/crypto/test/PKCS5Test.java
index 6145114e..66aef5eb 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/PKCS5Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/PKCS5Test.java
@@ -1,30 +1,30 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.ByteArrayInputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.EncryptionScheme;
-import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.EncryptionScheme;
+import org.spongycastle.asn1.pkcs.KeyDerivationFunc;
+import org.spongycastle.asn1.pkcs.PBES2Parameters;
+import org.spongycastle.asn1.pkcs.PBKDF2Params;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RC2CBCParameter;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.RC2Engine;
+import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* A test class for PKCS5 PBES2 with PBKDF2 (PKCS5 v2.0) using
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/PSSBlindTest.java b/core/src/test/java/org/spongycastle/crypto/test/PSSBlindTest.java
index 5e391ae2..36362bca 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/PSSBlindTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/PSSBlindTest.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.RSABlindingEngine;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.generators.RSABlindingFactorGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSABlindingParameters;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.PSSSigner;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.RSABlindingEngine;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.generators.RSABlindingFactorGenerator;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.params.RSABlindingParameters;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.crypto.signers.PSSSigner;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
import java.math.BigInteger;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/PSSTest.java b/core/src/test/java/org/spongycastle/crypto/test/PSSTest.java
index a718f8cd..517433a6 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/PSSTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/PSSTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.PSSSigner;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.crypto.signers.PSSSigner;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/*
* RSA PSS test vectors for PKCS#1 V2.1
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/PaddingTest.java b/core/src/test/java/org/spongycastle/crypto/test/PaddingTest.java
index c963b26e..2e905377 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/PaddingTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/PaddingTest.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.paddings.BlockCipherPadding;
-import org.bouncycastle.crypto.paddings.ISO10126d2Padding;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.paddings.TBCPadding;
-import org.bouncycastle.crypto.paddings.X923Padding;
-import org.bouncycastle.crypto.paddings.ZeroBytePadding;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.paddings.BlockCipherPadding;
+import org.spongycastle.crypto.paddings.ISO10126d2Padding;
+import org.spongycastle.crypto.paddings.ISO7816d4Padding;
+import org.spongycastle.crypto.paddings.PKCS7Padding;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.paddings.TBCPadding;
+import org.spongycastle.crypto.paddings.X923Padding;
+import org.spongycastle.crypto.paddings.ZeroBytePadding;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* General Padding tests.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Poly1305Test.java b/core/src/test/java/org/spongycastle/crypto/test/Poly1305Test.java
index 08ee8e10..2410f249 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Poly1305Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Poly1305Test.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.Poly1305;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.Poly1305;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/*
*/
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RC2Test.java b/core/src/test/java/org/spongycastle/crypto/test/RC2Test.java
index 3c4e569b..fde13347 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RC2Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RC2Test.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.crypto.engines.RC2Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.RC2Parameters;
+import org.spongycastle.util.encoders.Hex;
/**
* RC2 tester - vectors from ftp://ftp.isi.edu/in-notes/rfc2268.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RC2WrapTest.java b/core/src/test/java/org/spongycastle/crypto/test/RC2WrapTest.java
index 0b52a60b..27cca204 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RC2WrapTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RC2WrapTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.RC2WrapEngine;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.engines.RC2WrapEngine;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.params.RC2Parameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* RC2 wrap tester
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RC4Test.java b/core/src/test/java/org/spongycastle/crypto/test/RC4Test.java
index e4d39743..c03b4e51 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RC4Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RC4Test.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.RC4Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* RC4 Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RC5Test.java b/core/src/test/java/org/spongycastle/crypto/test/RC5Test.java
index 0ffdc89a..29686ee0 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RC5Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RC5Test.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.RC532Engine;
-import org.bouncycastle.crypto.engines.RC564Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.engines.RC532Engine;
+import org.spongycastle.crypto.engines.RC564Engine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.RC5Parameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* RC5 tester - vectors from ftp://ftp.nordu.net/rfc/rfc2040.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RC6Test.java b/core/src/test/java/org/spongycastle/crypto/test/RC6Test.java
index 254c1378..9d91547b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RC6Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RC6Test.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.RC6Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* RC6 Test - test vectors from AES Submitted RSA Reference implementation.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java b/core/src/test/java/org/spongycastle/crypto/test/RFC3211WrapTest.java
index f556cff6..8568e590 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RFC3211WrapTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.RFC3211WrapEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD128DigestTest.java
index bdd622ca..04c1c2b2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD128DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.RIPEMD128Digest;
/**
* RIPEMD128 Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD128HMacTest.java
index cc042c91..8a0a07c2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD128HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.RIPEMD128Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* RIPEMD128 HMac Test, test vectors from RFC 2286
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD160DigestTest.java
index e92693d2..9af98c92 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD160DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
/**
* RIPEMD160 Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD160HMacTest.java
index 7e6e8132..1676fef3 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD160HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* RIPEMD160 HMac Test, test vectors from RFC 2286
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD256DigestTest.java
index 4de70d8e..dd8a1b9c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD256DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.RIPEMD256Digest;
/**
* RIPEMD128 Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD320DigestTest.java
index 351b1b74..c64616ba 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RIPEMD320DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD320Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.RIPEMD320Digest;
/**
* RIPEMD320 Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RSABlindedTest.java b/core/src/test/java/org/spongycastle/crypto/test/RSABlindedTest.java
index 7cb6e98a..749e6ba1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RSABlindedTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RSABlindedTest.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
import java.math.BigInteger;
import java.security.SecureRandom;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java b/core/src/test/java/org/spongycastle/crypto/test/RSADigestSignerTest.java
index 605a2cac..5587dcf8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RSADigestSignerTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.crypto.signers.RSADigestSigner;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.test.SimpleTest;
import java.math.BigInteger;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java b/core/src/test/java/org/spongycastle/crypto/test/RSAKeyEncapsulationTest.java
index 058f4682..b2f0f8fd 100755
--- a/core/src/test/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RSAKeyEncapsulationTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.kems.RSAKeyEncapsulation;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.kems.RSAKeyEncapsulation;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.util.test.SimpleTest;
/**
* Tests for the RSA Key Encapsulation Mechanism
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RSATest.java b/core/src/test/java/org/spongycastle/crypto/test/RSATest.java
index a1ea3996..bf115003 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RSATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RSATest.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSAEngine;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class RSATest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RegressionTest.java b/core/src/test/java/org/spongycastle/crypto/test/RegressionTest.java
index 4913081c..0c89e979 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RegressionTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ResetTest.java b/core/src/test/java/org/spongycastle/crypto/test/ResetTest.java
index efd0e06c..dd323d7d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ResetTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ResetTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class ResetTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/RijndaelTest.java b/core/src/test/java/org/spongycastle/crypto/test/RijndaelTest.java
index ca81dfb1..6c5d742b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/RijndaelTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/RijndaelTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.RijndaelEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.RijndaelEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test vectors from the NIST standard tests and Brian Gladman's vector set
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SCryptTest.java b/core/src/test/java/org/spongycastle/crypto/test/SCryptTest.java
index b017a1da..f64a6a76 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SCryptTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SCryptTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.BufferedReader;
import java.io.InputStreamReader;
-import org.bouncycastle.crypto.generators.SCrypt;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.generators.SCrypt;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/*
* scrypt test vectors from "Stronger Key Derivation Via Sequential Memory-hard Functions" Appendix B.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SEEDTest.java b/core/src/test/java/org/spongycastle/crypto/test/SEEDTest.java
index 4aa955b2..a38c59c1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SEEDTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SEEDTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.SEEDEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* SEED tester - vectors http://www.ietf.org/rfc/rfc4009.txt
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA1DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA1DigestTest.java
index 38b9b807..ab0adae2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA1DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA1DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
/**
* standard vector test for SHA-1 from "Handbook of Applied Cryptography", page 345.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA1HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA1HMacTest.java
index 72a5fdc9..4740988c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA1HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA1HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA1 HMac Test, test vectors from RFC 2202
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA224DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA224DigestTest.java
index d14f87d9..abe5b316 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA224DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA224DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA224Digest;
/**
* standard vector test for SHA-224 from RFC 3874 - only the last three are in
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA224HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA224HMacTest.java
index 52abb16f..5f4c73ed 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA224HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA224HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA224 HMac Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA256DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA256DigestTest.java
index 8a35ce42..548ca1fb 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA256DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA256DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
/**
* standard vector test for SHA-256 from FIPS Draft 180-2.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA256HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA256HMacTest.java
index 82ab1dc7..f29a81d1 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA256HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA256HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA256 HMac Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA384DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA384DigestTest.java
index 7b5f149f..7e1afbf3 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA384DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA384DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
/**
* standard vector test for SHA-384 from FIPS Draft 180-2.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA384HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA384HMacTest.java
index fe903a39..77152471 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA384HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA384HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA384 HMac Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA3DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA3DigestTest.java
index 260d457a..eb636e2a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA3DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA3DigestTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.digests.SHA3Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* SHA3 Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA512DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA512DigestTest.java
index ffebaee4..e1ccc9e2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA512DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA512DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
/**
* standard vector test for SHA-512 from FIPS Draft 180-2.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA512HMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA512HMacTest.java
index ee163eb5..c4b4d66a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA512HMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA512HMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
/**
* SHA512 HMac Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA512t224DigestTest.java
index 0c7bc954..443aa0b9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA512t224DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA512tDigest;
/**
* standard vector test for SHA-512/224 from FIPS 180-4.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SHA512t256DigestTest.java
index db019ae6..3e44cf5f 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SHA512t256DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA512tDigest;
/**
* standard vector test for SHA-512/256 from FIPS 180-4.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SM3DigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SM3DigestTest.java
index 2d418cb5..df0bec32 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SM3DigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SM3DigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SM3Digest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SM3Digest;
/**
* standard vector test for SM3 digest from chinese specification
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SRP6Test.java b/core/src/test/java/org/spongycastle/crypto/test/SRP6Test.java
index 349c2197..c2ab0ad8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SRP6Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SRP6Test.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.agreement.srp.SRP6Client;
-import org.bouncycastle.crypto.agreement.srp.SRP6Server;
-import org.bouncycastle.crypto.agreement.srp.SRP6Util;
-import org.bouncycastle.crypto.agreement.srp.SRP6VerifierGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DHParametersGenerator;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.agreement.srp.SRP6Client;
+import org.spongycastle.crypto.agreement.srp.SRP6Server;
+import org.spongycastle.crypto.agreement.srp.SRP6Util;
+import org.spongycastle.crypto.agreement.srp.SRP6VerifierGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.DHParametersGenerator;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class SRP6Test extends SimpleTest
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Salsa20Test.java b/core/src/test/java/org/spongycastle/crypto/test/Salsa20Test.java
index 940fb573..1cdf10cf 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Salsa20Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Salsa20Test.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.Salsa20Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Salsa20 Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SerpentTest.java b/core/src/test/java/org/spongycastle/crypto/test/SerpentTest.java
index 3eac33a7..bf687980 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SerpentTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SerpentTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.SerpentEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
*/
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Shacal2Test.java b/core/src/test/java/org/spongycastle/crypto/test/Shacal2Test.java
index bd7a8154..5ffd9473 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Shacal2Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Shacal2Test.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.Shacal2Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.Shacal2Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Shacal2 tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/ShortenedDigestTest.java
index 20510c94..58b70149 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/ShortenedDigestTest.java
@@ -4,13 +4,13 @@
* To change the template for this generated file go to
* Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
*/
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.ExtendedDigest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.digests.ShortenedDigest;
+import org.spongycastle.util.test.SimpleTest;
public class ShortenedDigestTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java b/core/src/test/java/org/spongycastle/crypto/test/SipHashTest.java
index 1c55411d..6c6b28e2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SipHashTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SipHashTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.macs.SipHash;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Pack;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.macs.SipHash;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Pack;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/*
* SipHash test values from "SipHash: a fast short-input PRF", by Jean-Philippe
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SkeinDigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/SkeinDigestTest.java
index 1a7dff6f..cb5c8648 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SkeinDigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SkeinDigestTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SkeinDigest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SkeinDigest;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Memoable;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class SkeinDigestTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SkeinMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/SkeinMacTest.java
index 68008b7a..3f1c616f 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SkeinMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SkeinMacTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.io.IOException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.macs.SkeinMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class SkeinMacTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/SkipjackTest.java b/core/src/test/java/org/spongycastle/crypto/test/SkipjackTest.java
index 455e10bd..e7b2d867 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/SkipjackTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/SkipjackTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.SkipjackEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
*/
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java b/core/src/test/java/org/spongycastle/crypto/test/StreamCipherResetTest.java
index 092de5fb..7c166ada 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/StreamCipherResetTest.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.engines.ISAACEngine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.ChaChaEngine;
+import org.spongycastle.crypto.engines.Grain128Engine;
+import org.spongycastle.crypto.engines.Grainv1Engine;
+import org.spongycastle.crypto.engines.HC128Engine;
+import org.spongycastle.crypto.engines.HC256Engine;
+import org.spongycastle.crypto.engines.ISAACEngine;
+import org.spongycastle.crypto.engines.RC4Engine;
+import org.spongycastle.crypto.engines.Salsa20Engine;
+import org.spongycastle.crypto.engines.XSalsa20Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test whether block ciphers implement reset contract on init, encrypt/decrypt and reset.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java b/core/src/test/java/org/spongycastle/crypto/test/StreamCipherVectorTest.java
index 7b788280..2d3b197d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/StreamCipherVectorTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* a basic test that takes a stream cipher, key parameter, and an input
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/TEATest.java b/core/src/test/java/org/spongycastle/crypto/test/TEATest.java
index 98b0ec9a..a2740600 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/TEATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/TEATest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.TEAEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* TEA tester - based on C implementation results from http://www.simonshepherd.supanet.com/tea.htm
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Threefish1024Test.java b/core/src/test/java/org/spongycastle/crypto/test/Threefish1024Test.java
index a580a156..9e087187 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Threefish1024Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Threefish1024Test.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.TweakableBlockCipherParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class Threefish1024Test
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Threefish256Test.java b/core/src/test/java/org/spongycastle/crypto/test/Threefish256Test.java
index 10bd6080..6753c245 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Threefish256Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Threefish256Test.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.TweakableBlockCipherParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class Threefish256Test
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/Threefish512Test.java b/core/src/test/java/org/spongycastle/crypto/test/Threefish512Test.java
index 1eb4e85c..ba5447f4 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/Threefish512Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/Threefish512Test.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.TweakableBlockCipherParameters;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class Threefish512Test
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/TigerDigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/TigerDigestTest.java
index deb838f0..b9a40655 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/TigerDigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/TigerDigestTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.TigerDigest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.TigerDigest;
/**
* Tiger Digest Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/TwofishTest.java b/core/src/test/java/org/spongycastle/crypto/test/TwofishTest.java
index 50a41c81..84f3e7fc 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/TwofishTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/TwofishTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class TwofishTest
extends CipherTest
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java b/core/src/test/java/org/spongycastle/crypto/test/VMPCKSA3Test.java
index 65fdfc22..21000db9 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/VMPCKSA3Test.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.engines.VMPCKSA3Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.engines.VMPCKSA3Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* VMPC Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/VMPCMacTest.java b/core/src/test/java/org/spongycastle/crypto/test/VMPCMacTest.java
index 50a0410b..a8d84029 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/VMPCMacTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/VMPCMacTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.macs.VMPCMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.macs.VMPCMac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class VMPCMacTest extends SimpleTest
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/VMPCTest.java b/core/src/test/java/org/spongycastle/crypto/test/VMPCTest.java
index cedffa46..8155ddcc 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/VMPCTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/VMPCTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.engines.VMPCEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.engines.VMPCEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* VMPC Test
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java b/core/src/test/java/org/spongycastle/crypto/test/WhirlpoolDigestTest.java
index 542e6e6b..806f5cc2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/WhirlpoolDigestTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.WhirlpoolDigest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.WhirlpoolDigest;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* ISO vector test for Whirlpool
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/XSalsa20Test.java b/core/src/test/java/org/spongycastle/crypto/test/XSalsa20Test.java
index efbd5ec0..6c0ab486 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/XSalsa20Test.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/XSalsa20Test.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+package org.spongycastle.crypto.test;
+
+import org.spongycastle.crypto.engines.XSalsa20Engine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class XSalsa20Test extends SimpleTest
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/XTEATest.java b/core/src/test/java/org/spongycastle/crypto/test/XTEATest.java
index 2b5279e9..74da43be 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/XTEATest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/XTEATest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.engines.XTEAEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
/**
* TEA tester - based on C implementation results from http://www.simonshepherd.supanet.com/tea.htm
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPListener.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPListener.java
index 81f86e57..71011614 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPListener.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPListener.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.util.Properties;
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPReader.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPReader.java
index 9cd33afc..2cee4559 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/CAVPReader.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/CAVPReader.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.BufferedReader;
import java.io.IOException;
@@ -7,18 +7,18 @@ import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.macs.HMac;
public class CAVPReader
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFCounterTests.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFCounterTests.java
index 81f10824..ee53d475 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFCounterTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFCounterTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.FileWriter;
import java.io.IOException;
@@ -6,13 +6,13 @@ import java.io.PrintWriter;
import java.util.Properties;
import java.util.regex.Matcher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.KDFCounterBytesGenerator;
-import org.bouncycastle.crypto.params.KDFCounterParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.TestFailedException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.KDFCounterBytesGenerator;
+import org.spongycastle.crypto.params.KDFCounterParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.TestFailedException;
public final class KDFCounterTests
implements CAVPListener
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java
index 5b3df023..8f58be49 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineCounterTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.FileWriter;
import java.io.IOException;
@@ -6,13 +6,13 @@ import java.io.PrintWriter;
import java.util.Properties;
import java.util.regex.Matcher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.KDFDoublePipelineIterationBytesGenerator;
-import org.bouncycastle.crypto.params.KDFDoublePipelineIterationParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.TestFailedException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.KDFDoublePipelineIterationBytesGenerator;
+import org.spongycastle.crypto.params.KDFDoublePipelineIterationParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.TestFailedException;
public final class KDFDoublePipelineCounterTests
implements CAVPListener
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java
index 3923f9a1..512568f5 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFDoublePipelineIterationNoCounterTests.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Properties;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.KDFDoublePipelineIterationBytesGenerator;
-import org.bouncycastle.crypto.params.KDFDoublePipelineIterationParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.TestFailedException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.KDFDoublePipelineIterationBytesGenerator;
+import org.spongycastle.crypto.params.KDFDoublePipelineIterationParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.TestFailedException;
public final class KDFDoublePipelineIterationNoCounterTests
implements CAVPListener
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounterTests.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackCounterTests.java
index 6f8a0fde..84cd4dd8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounterTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackCounterTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.FileWriter;
import java.io.IOException;
@@ -6,13 +6,13 @@ import java.io.PrintWriter;
import java.util.Properties;
import java.util.regex.Matcher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.KDFFeedbackBytesGenerator;
-import org.bouncycastle.crypto.params.KDFFeedbackParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.TestFailedException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.KDFFeedbackBytesGenerator;
+import org.spongycastle.crypto.params.KDFFeedbackParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.TestFailedException;
public final class KDFFeedbackCounterTests
implements CAVPListener
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java
index cd7d8b80..4c6fa942 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounterTests.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.crypto.test.cavp;
+package org.spongycastle.crypto.test.cavp;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Properties;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.KDFFeedbackBytesGenerator;
-import org.bouncycastle.crypto.params.KDFFeedbackParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.TestFailedException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.KDFFeedbackBytesGenerator;
+import org.spongycastle.crypto.params.KDFFeedbackParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.TestFailedException;
public final class KDFFeedbackNoCounterTests
implements CAVPListener
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/speedy/MacThroughputTest.java b/core/src/test/java/org/spongycastle/crypto/test/speedy/MacThroughputTest.java
index 8249fd18..ffbc673f 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/speedy/MacThroughputTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/speedy/MacThroughputTest.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.crypto.test.speedy;
+package org.spongycastle.crypto.test.speedy;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.NullEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.Poly1305;
-import org.bouncycastle.crypto.macs.SipHash;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.NullEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.macs.Poly1305;
+import org.spongycastle.crypto.macs.SipHash;
+import org.spongycastle.crypto.macs.SkeinMac;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
/**
* Microbenchmark of MACs on short, medium, long messages, with optional object creation cost.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/speedy/Poly1305Reference.java b/core/src/test/java/org/spongycastle/crypto/test/speedy/Poly1305Reference.java
index c8db287a..a30c1116 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/speedy/Poly1305Reference.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/speedy/Poly1305Reference.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.test.speedy;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
+package org.spongycastle.crypto.test.speedy;
+
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
/**
* Poly1305 message authentication code, designed by D. J. Bernstein.
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/speedy/ThreefishReferenceEngine.java b/core/src/test/java/org/spongycastle/crypto/test/speedy/ThreefishReferenceEngine.java
index 7dabbde0..768bb954 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/speedy/ThreefishReferenceEngine.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/speedy/ThreefishReferenceEngine.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.test.speedy;
+package org.spongycastle.crypto.test.speedy;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.TweakableBlockCipherParameters;
public class ThreefishReferenceEngine
implements BlockCipher
diff --git a/core/src/test/java/org/bouncycastle/crypto/test/speedy/ThroughputTest.java b/core/src/test/java/org/spongycastle/crypto/test/speedy/ThroughputTest.java
index 7c090f8a..69b942fc 100644
--- a/core/src/test/java/org/bouncycastle/crypto/test/speedy/ThroughputTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/test/speedy/ThroughputTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.test.speedy;
+package org.spongycastle.crypto.test.speedy;
import java.io.IOException;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.TweakableBlockCipherParameters;
+import org.spongycastle.util.encoders.Hex;
public class ThroughputTest
{
@@ -89,14 +89,14 @@ public class ThroughputTest
System.out.println("Plaintext : " + new String(Hex.encode(plaintext)));
System.out.println("Expected : " + new String(Hex.encode(expected)));
System.out.println("Ciphertext : " + new String(Hex.encode(ciphertext)));
- System.out.println(" Encrypt : " + org.bouncycastle.util.Arrays.areEqual(expected, ciphertext));
+ System.out.println(" Encrypt : " + org.spongycastle.util.Arrays.areEqual(expected, ciphertext));
cipher.init(false, new TweakableBlockCipherParameters(new KeyParameter(key), tweak));
byte[] replain = new byte[plaintext.length];
cipher.processBlock(ciphertext, 0, replain, 0);
System.out.println("Replain : " + new String(Hex.encode(replain)));
- System.out.println(" Decrypt : " + org.bouncycastle.util.Arrays.areEqual(plaintext, replain));
+ System.out.println(" Decrypt : " + org.spongycastle.util.Arrays.areEqual(plaintext, replain));
}
private static void testTF_512_2()
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/AllTests.java b/core/src/test/java/org/spongycastle/crypto/tls/test/AllTests.java
index ef5b29bc..6970aa1d 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import junit.framework.Test;
import junit.framework.TestSuite;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/BasicTlsTest.java
index 7be21ed4..91194992 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/BasicTlsTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.InputStream;
@@ -8,20 +8,20 @@ import java.net.Socket;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.AlwaysValidVerifyer;
-import org.bouncycastle.crypto.tls.Certificate;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.LegacyTlsClient;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsKeyExchange;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.crypto.tls.AlertDescription;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.AlwaysValidVerifyer;
+import org.spongycastle.crypto.tls.Certificate;
+import org.spongycastle.crypto.tls.CipherSuite;
+import org.spongycastle.crypto.tls.DefaultTlsClient;
+import org.spongycastle.crypto.tls.LegacyTlsClient;
+import org.spongycastle.crypto.tls.TlsAuthentication;
+import org.spongycastle.crypto.tls.TlsClient;
+import org.spongycastle.crypto.tls.TlsClientProtocol;
+import org.spongycastle.crypto.tls.TlsFatalAlert;
+import org.spongycastle.crypto.tls.TlsKeyExchange;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
public class BasicTlsTest
extends TestCase
@@ -143,7 +143,7 @@ public class BasicTlsTest
keyExchange
.processServerCertificate(new Certificate(
- new org.bouncycastle.asn1.x509.Certificate[]{org.bouncycastle.asn1.x509.Certificate
+ new org.spongycastle.asn1.x509.Certificate[]{org.spongycastle.asn1.x509.Certificate
.getInstance(encCert)}));
}
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSClientTest.java
index ada1a2e5..d091a132 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSClientTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.crypto.tls.UDPTransport;
+import org.spongycastle.crypto.tls.DTLSClientProtocol;
+import org.spongycastle.crypto.tls.DTLSTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.TlsClient;
+import org.spongycastle.crypto.tls.TlsSession;
+import org.spongycastle.crypto.tls.UDPTransport;
/**
* A simple test designed to conduct a DTLS handshake with an external DTLS server.
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSProtocolTest.java
index df5a3f87..838e65cd 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSProtocolTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.tls.DTLSClientProtocol;
+import org.spongycastle.crypto.tls.DTLSServerProtocol;
+import org.spongycastle.crypto.tls.DTLSTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.util.Arrays;
public class DTLSProtocolTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSServerTest.java
index 5f6c09b0..5296ce52 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSServerTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
@@ -6,10 +6,10 @@ import java.net.InetAddress;
import java.net.SocketTimeoutException;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.UDPTransport;
+import org.spongycastle.crypto.tls.DTLSServerProtocol;
+import org.spongycastle.crypto.tls.DTLSTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.UDPTransport;
/**
* A simple test designed to conduct a DTLS handshake with an external DTLS client.
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSTestCase.java
index 65482a77..ebb9c30b 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/DTLSTestCase.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.tls.DTLSClientProtocol;
+import org.spongycastle.crypto.tls.DTLSServerProtocol;
+import org.spongycastle.crypto.tls.DTLSTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java b/core/src/test/java/org/spongycastle/crypto/tls/test/HTTPSServerThread.java
index d55bc737..07eb86e0 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/HTTPSServerThread.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/KeyStores.java b/core/src/test/java/org/spongycastle/crypto/tls/test/KeyStores.java
index bf71f965..5aa0b396 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/KeyStores.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/KeyStores.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
-import org.bouncycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Base64;
public class KeyStores
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java b/core/src/test/java/org/spongycastle/crypto/tls/test/LoggingDatagramTransport.java
index 41816193..ff9bdc04 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/LoggingDatagramTransport.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
-import org.bouncycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
public class LoggingDatagramTransport
implements DatagramTransport
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSClient.java
index 5aba7f89..4a728714 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSClient.java
@@ -1,25 +1,25 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.MaxFragmentLength;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.DefaultTlsClient;
+import org.spongycastle.crypto.tls.MaxFragmentLength;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsAuthentication;
+import org.spongycastle.crypto.tls.TlsCredentials;
+import org.spongycastle.crypto.tls.TlsExtensionsUtils;
+import org.spongycastle.crypto.tls.TlsSession;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
public class MockDTLSClient
extends DefaultTlsClient
@@ -102,7 +102,7 @@ public class MockDTLSClient
{
return new TlsAuthentication()
{
- public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
+ public void notifyServerCertificate(org.spongycastle.crypto.tls.Certificate serverCertificate)
throws IOException
{
Certificate[] chain = serverCertificate.getCertificateList();
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSServer.java
index abd5d731..8c41ba74 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDTLSServer.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Vector;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.HashAlgorithm;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.CipherSuite;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.DefaultTlsServer;
+import org.spongycastle.crypto.tls.HashAlgorithm;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsEncryptionCredentials;
+import org.spongycastle.crypto.tls.TlsSignerCredentials;
+import org.spongycastle.crypto.tls.TlsUtils;
+import org.spongycastle.util.Arrays;
public class MockDTLSServer
extends DefaultTlsServer
@@ -84,7 +84,7 @@ public class MockDTLSServer
return new CertificateRequest(new short[]{ ClientCertificateType.rsa_sign }, serverSigAlgs, certificateAuthorities);
}
- public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
+ public void notifyClientCertificate(org.spongycastle.crypto.tls.Certificate clientCertificate)
throws IOException
{
Certificate[] chain = clientCertificate.getCertificateList();
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDatagramAssociation.java
index b8b7c069..92bc6c1c 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/MockDatagramAssociation.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.net.DatagramPacket;
import java.util.Vector;
-import org.bouncycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
public class MockDatagramAssociation
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java b/core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsClient.java
index bc17db8c..db62c5e3 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsClient.java
@@ -1,25 +1,25 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.MaxFragmentLength;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.DefaultTlsClient;
+import org.spongycastle.crypto.tls.MaxFragmentLength;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsAuthentication;
+import org.spongycastle.crypto.tls.TlsCredentials;
+import org.spongycastle.crypto.tls.TlsExtensionsUtils;
+import org.spongycastle.crypto.tls.TlsSession;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.encoders.Hex;
class MockTlsClient
extends DefaultTlsClient
@@ -92,7 +92,7 @@ class MockTlsClient
{
return new TlsAuthentication()
{
- public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
+ public void notifyServerCertificate(org.spongycastle.crypto.tls.Certificate serverCertificate)
throws IOException
{
Certificate[] chain = serverCertificate.getCertificateList();
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java b/core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsServer.java
index 0f3c4631..a0340ff8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/MockTlsServer.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Vector;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.HashAlgorithm;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.CipherSuite;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.DefaultTlsServer;
+import org.spongycastle.crypto.tls.HashAlgorithm;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsEncryptionCredentials;
+import org.spongycastle.crypto.tls.TlsSignerCredentials;
+import org.spongycastle.crypto.tls.TlsUtils;
+import org.spongycastle.util.Arrays;
class MockTlsServer
extends DefaultTlsServer
@@ -98,7 +98,7 @@ class MockTlsServer
return new CertificateRequest(new short[]{ ClientCertificateType.rsa_sign }, serverSigAlgs, certificateAuthorities);
}
- public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
+ public void notifyClientCertificate(org.spongycastle.crypto.tls.Certificate clientCertificate)
throws IOException
{
Certificate[] chain = clientCertificate.getCertificateList();
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java b/core/src/test/java/org/spongycastle/crypto/tls/test/NetworkInputStream.java
index e5f47706..4764805a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/NetworkInputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.FilterInputStream;
import java.io.IOException;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java b/core/src/test/java/org/spongycastle/crypto/tls/test/NetworkOutputStream.java
index a11694b7..5e619958 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/NetworkOutputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.FilterOutputStream;
import java.io.IOException;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsClientTest.java
index 10485ccd..96634fe8 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsClientTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.BufferedReader;
import java.io.IOException;
@@ -9,8 +9,8 @@ import java.net.InetAddress;
import java.net.Socket;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
+import org.spongycastle.crypto.tls.TlsClient;
+import org.spongycastle.crypto.tls.TlsClientProtocol;
/**
* A simple test designed to conduct a TLS handshake with an external TLS server.
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsProtocolTest.java
index a817c47a..06754648 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsProtocolTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.OutputStream;
import java.io.PipedInputStream;
@@ -7,10 +7,10 @@ import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
+import org.spongycastle.crypto.tls.TlsClientProtocol;
+import org.spongycastle.crypto.tls.TlsServerProtocol;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.io.Streams;
public class TlsProtocolTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsServerTest.java
index e590cf5e..af74ec77 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsServerTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.OutputStream;
@@ -7,9 +7,9 @@ import java.net.ServerSocket;
import java.net.Socket;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.io.TeeOutputStream;
+import org.spongycastle.crypto.tls.TlsServerProtocol;
+import org.spongycastle.util.io.Streams;
+import org.spongycastle.util.io.TeeOutputStream;
/**
* A simple test designed to conduct a TLS handshake with an external TLS client.
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestCase.java
index 8e7f13a6..bfcf7cba 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestCase.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.OutputStream;
import java.io.PipedInputStream;
@@ -8,12 +8,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
+import org.spongycastle.crypto.tls.AlertDescription;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.TlsClientProtocol;
+import org.spongycastle.crypto.tls.TlsServerProtocol;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.io.Streams;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestClientImpl.java
index 4bc76e68..cb4c4d15 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestClientImpl.java
@@ -1,27 +1,27 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertDescription;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.ConnectionEnd;
+import org.spongycastle.crypto.tls.DefaultTlsClient;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsAuthentication;
+import org.spongycastle.crypto.tls.TlsCredentials;
+import org.spongycastle.crypto.tls.TlsFatalAlert;
+import org.spongycastle.crypto.tls.TlsSignerCredentials;
+import org.spongycastle.util.Arrays;
class TlsTestClientImpl
extends DefaultTlsClient
@@ -121,7 +121,7 @@ class TlsTestClientImpl
{
return new TlsAuthentication()
{
- public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
+ public void notifyServerCertificate(org.spongycastle.crypto.tls.Certificate serverCertificate)
throws IOException
{
boolean isEmpty = serverCertificate == null || serverCertificate.isEmpty();
@@ -207,9 +207,9 @@ class TlsTestClientImpl
return sig;
}
- public org.bouncycastle.crypto.tls.Certificate getCertificate()
+ public org.spongycastle.crypto.tls.Certificate getCertificate()
{
- org.bouncycastle.crypto.tls.Certificate cert = signerCredentials.getCertificate();
+ org.spongycastle.crypto.tls.Certificate cert = signerCredentials.getCertificate();
if (config.clientAuth == TlsTestConfig.CLIENT_AUTH_INVALID_CERT)
{
@@ -228,11 +228,11 @@ class TlsTestClientImpl
};
}
- protected org.bouncycastle.crypto.tls.Certificate corruptCertificate(org.bouncycastle.crypto.tls.Certificate cert)
+ protected org.spongycastle.crypto.tls.Certificate corruptCertificate(org.spongycastle.crypto.tls.Certificate cert)
{
Certificate[] certList = cert.getCertificateList();
certList[0] = corruptCertificateSignature(certList[0]);
- return new org.bouncycastle.crypto.tls.Certificate(certList);
+ return new org.spongycastle.crypto.tls.Certificate(certList);
}
protected Certificate corruptCertificateSignature(Certificate cert)
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestConfig.java
index 6110458e..5eaeaff2 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestConfig.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.ConnectionEnd;
+import org.spongycastle.crypto.tls.ProtocolVersion;
public class TlsTestConfig
{
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestServerImpl.java
index 835db459..5dc9f278 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestServerImpl.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Vector;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.HashAlgorithm;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.crypto.tls.AlertDescription;
+import org.spongycastle.crypto.tls.AlertLevel;
+import org.spongycastle.crypto.tls.CertificateRequest;
+import org.spongycastle.crypto.tls.ClientCertificateType;
+import org.spongycastle.crypto.tls.ConnectionEnd;
+import org.spongycastle.crypto.tls.DefaultTlsServer;
+import org.spongycastle.crypto.tls.HashAlgorithm;
+import org.spongycastle.crypto.tls.ProtocolVersion;
+import org.spongycastle.crypto.tls.SignatureAlgorithm;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsEncryptionCredentials;
+import org.spongycastle.crypto.tls.TlsFatalAlert;
+import org.spongycastle.crypto.tls.TlsSignerCredentials;
+import org.spongycastle.crypto.tls.TlsUtils;
class TlsTestServerImpl
extends DefaultTlsServer
@@ -147,7 +147,7 @@ class TlsTestServerImpl
return new CertificateRequest(new short[]{ ClientCertificateType.rsa_sign }, serverSigAlgs, certificateAuthorities);
}
- public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
+ public void notifyClientCertificate(org.spongycastle.crypto.tls.Certificate clientCertificate)
throws IOException
{
boolean isEmpty = (clientCertificate == null || clientCertificate.isEmpty());
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestUtils.java
index cf0bdb16..4bdf154a 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/TlsTestUtils.java
@@ -1,27 +1,27 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.tls.Certificate;
-import org.bouncycastle.crypto.tls.DefaultTlsAgreementCredentials;
-import org.bouncycastle.crypto.tls.DefaultTlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.DefaultTlsSignerCredentials;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAgreementCredentials;
-import org.bouncycastle.crypto.tls.TlsContext;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemReader;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.crypto.tls.Certificate;
+import org.spongycastle.crypto.tls.DefaultTlsAgreementCredentials;
+import org.spongycastle.crypto.tls.DefaultTlsEncryptionCredentials;
+import org.spongycastle.crypto.tls.DefaultTlsSignerCredentials;
+import org.spongycastle.crypto.tls.SignatureAndHashAlgorithm;
+import org.spongycastle.crypto.tls.TlsAgreementCredentials;
+import org.spongycastle.crypto.tls.TlsContext;
+import org.spongycastle.crypto.tls.TlsEncryptionCredentials;
+import org.spongycastle.crypto.tls.TlsSignerCredentials;
+import org.spongycastle.crypto.util.PrivateKeyFactory;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.io.pem.PemObject;
+import org.spongycastle.util.io.pem.PemReader;
public class TlsTestUtils
{
@@ -47,7 +47,7 @@ public class TlsTestUtils
+ "0lAQH/BAgwBgYEVR0lADAcBgNVHREBAf8EEjAQgQ50ZXN0QHRlc3QudGVzdDANBgkqhkiG9w0BAQQFAANBAJg55PBS"
+ "weg6obRUKF4FF6fCrWFi6oCYSQ99LWcAeupc5BofW5MstFMhCOaEucuGVqunwT5G7/DweazzCIrSzB0=");
- static String fingerprint(org.bouncycastle.asn1.x509.Certificate c)
+ static String fingerprint(org.spongycastle.asn1.x509.Certificate c)
throws IOException
{
byte[] der = c.getEncoded();
@@ -108,7 +108,7 @@ public class TlsTestUtils
static Certificate loadCertificateChain(String[] resources)
throws IOException
{
- org.bouncycastle.asn1.x509.Certificate[] chain = new org.bouncycastle.asn1.x509.Certificate[resources.length];
+ org.spongycastle.asn1.x509.Certificate[] chain = new org.spongycastle.asn1.x509.Certificate[resources.length];
for (int i = 0; i < resources.length; ++i)
{
chain[i] = loadCertificateResource(resources[i]);
@@ -116,13 +116,13 @@ public class TlsTestUtils
return new Certificate(chain);
}
- static org.bouncycastle.asn1.x509.Certificate loadCertificateResource(String resource)
+ static org.spongycastle.asn1.x509.Certificate loadCertificateResource(String resource)
throws IOException
{
PemObject pem = loadPemResource(resource);
if (pem.getType().endsWith("CERTIFICATE"))
{
- return org.bouncycastle.asn1.x509.Certificate.getInstance(pem.getContent());
+ return org.spongycastle.asn1.x509.Certificate.getInstance(pem.getContent());
}
throw new IllegalArgumentException("'resource' doesn't specify a valid certificate");
}
diff --git a/core/src/test/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java b/core/src/test/java/org/spongycastle/crypto/tls/test/UnreliableDatagramTransport.java
index bdc205ae..b1b38817 100644
--- a/core/src/test/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java
+++ b/core/src/test/java/org/spongycastle/crypto/tls/test/UnreliableDatagramTransport.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.tls.test;
+package org.spongycastle.crypto.tls.test;
import java.io.IOException;
import java.util.Random;
-import org.bouncycastle.crypto.tls.DatagramTransport;
+import org.spongycastle.crypto.tls.DatagramTransport;
public class UnreliableDatagramTransport
implements DatagramTransport
diff --git a/core/src/test/java/org/bouncycastle/i18n/filter/test/HTMLFilterTest.java b/core/src/test/java/org/spongycastle/i18n/filter/test/HTMLFilterTest.java
index e1dfb733..bd6716b0 100644
--- a/core/src/test/java/org/bouncycastle/i18n/filter/test/HTMLFilterTest.java
+++ b/core/src/test/java/org/spongycastle/i18n/filter/test/HTMLFilterTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.i18n.filter.test;
+package org.spongycastle.i18n.filter.test;
-import org.bouncycastle.i18n.filter.Filter;
-import org.bouncycastle.i18n.filter.HTMLFilter;
+import org.spongycastle.i18n.filter.Filter;
+import org.spongycastle.i18n.filter.HTMLFilter;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/i18n/filter/test/SQLFilterTest.java b/core/src/test/java/org/spongycastle/i18n/filter/test/SQLFilterTest.java
index 5c1cc363..a8340c02 100644
--- a/core/src/test/java/org/bouncycastle/i18n/filter/test/SQLFilterTest.java
+++ b/core/src/test/java/org/spongycastle/i18n/filter/test/SQLFilterTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.i18n.filter.test;
+package org.spongycastle.i18n.filter.test;
-import org.bouncycastle.i18n.filter.Filter;
-import org.bouncycastle.i18n.filter.SQLFilter;
+import org.spongycastle.i18n.filter.Filter;
+import org.spongycastle.i18n.filter.SQLFilter;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/i18n/test/AllTests.java b/core/src/test/java/org/spongycastle/i18n/test/AllTests.java
index ee490e1d..d9872801 100644
--- a/core/src/test/java/org/bouncycastle/i18n/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/i18n/test/AllTests.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.i18n.test;
+package org.spongycastle.i18n.test;
-import org.bouncycastle.i18n.filter.test.HTMLFilterTest;
-import org.bouncycastle.i18n.filter.test.SQLFilterTest;
+import org.spongycastle.i18n.filter.test.HTMLFilterTest;
+import org.spongycastle.i18n.filter.test.SQLFilterTest;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/i18n/test/LocalizedMessageTest.java b/core/src/test/java/org/spongycastle/i18n/test/LocalizedMessageTest.java
index f7c5a420..65e03f54 100644
--- a/core/src/test/java/org/bouncycastle/i18n/test/LocalizedMessageTest.java
+++ b/core/src/test/java/org/spongycastle/i18n/test/LocalizedMessageTest.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.i18n.test;
+package org.spongycastle.i18n.test;
import junit.framework.TestCase;
-import org.bouncycastle.i18n.LocaleString;
-import org.bouncycastle.i18n.LocalizedMessage;
-import org.bouncycastle.i18n.MissingEntryException;
-import org.bouncycastle.i18n.filter.HTMLFilter;
-import org.bouncycastle.i18n.filter.TrustedInput;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.i18n.LocaleString;
+import org.spongycastle.i18n.LocalizedMessage;
+import org.spongycastle.i18n.MissingEntryException;
+import org.spongycastle.i18n.filter.HTMLFilter;
+import org.spongycastle.i18n.filter.TrustedInput;
+import org.spongycastle.util.encoders.Hex;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
@@ -19,8 +19,8 @@ import java.util.TimeZone;
public class LocalizedMessageTest extends TestCase
{
- private static final String TEST_RESOURCE = "org.bouncycastle.i18n.test.I18nTestMessages";
- private static final String UTF8_TEST_RESOURCE = "org.bouncycastle.i18n.test.I18nUTF8TestMessages";
+ private static final String TEST_RESOURCE = "org.spongycastle.i18n.test.I18nTestMessages";
+ private static final String UTF8_TEST_RESOURCE = "org.spongycastle.i18n.test.I18nUTF8TestMessages";
/*
* test message id's
@@ -33,7 +33,7 @@ public class LocalizedMessageTest extends TestCase
private static final String utf8TestId = "utf8";
/*
- * Test method for 'org.bouncycastle.i18n.LocalizedMessage.getEntry(String,
+ * Test method for 'org.spongycastle.i18n.LocalizedMessage.getEntry(String,
* Locale, TimeZone)'
*/
public void testGetEntry()
@@ -178,7 +178,7 @@ public class LocalizedMessageTest extends TestCase
}
catch (MissingEntryException e)
{
- assertEquals("Can't find entry noname in resource file org.bouncycastle.i18n.test.I18nTestMessages.", e.getMessage());
+ assertEquals("Can't find entry noname in resource file org.spongycastle.i18n.test.I18nTestMessages.", e.getMessage());
}
}
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java b/core/src/test/java/org/spongycastle/math/ec/test/AllTests.java
index dcba332a..5388c743 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.math.ec.test;
+package org.spongycastle.math.ec.test;
import java.util.ArrayList;
import java.util.Enumeration;
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java b/core/src/test/java/org/spongycastle/math/ec/test/ECAlgorithmsTest.java
index 6e293bf6..153738b5 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/ECAlgorithmsTest.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/ECAlgorithmsTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.math.ec.test;
+package org.spongycastle.math.ec.test;
import java.math.BigInteger;
import java.security.SecureRandom;
@@ -10,12 +10,12 @@ import java.util.Set;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.asn1.x9.ECNamedCurveTable;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.ec.CustomNamedCurves;
+import org.spongycastle.math.ec.ECAlgorithms;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
public class ECAlgorithmsTest extends TestCase
{
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java b/core/src/test/java/org/spongycastle/math/ec/test/ECPointPerformanceTest.java
index 9be8d3ea..6be0c00b 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointPerformanceTest.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/ECPointPerformanceTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.math.ec.test;
+package org.spongycastle.math.ec.test;
import java.math.BigInteger;
import java.security.SecureRandom;
@@ -9,13 +9,13 @@ import java.util.SortedSet;
import java.util.TreeSet;
import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.Times;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x9.ECNamedCurveTable;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.ec.CustomNamedCurves;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.Times;
/**
* Compares the performance of the the window NAF point multiplication against conventional point
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java b/core/src/test/java/org/spongycastle/math/ec/test/ECPointTest.java
index efd6aca0..5987e22f 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/ECPointTest.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/ECPointTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.math.ec.test;
+package org.spongycastle.math.ec.test;
import java.math.BigInteger;
import java.security.SecureRandom;
@@ -12,18 +12,18 @@ import java.util.Set;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
+import org.spongycastle.asn1.x9.ECNamedCurveTable;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.ec.CustomNamedCurves;
+import org.spongycastle.math.ec.ECAlgorithms;
+import org.spongycastle.math.ec.ECConstants;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECFieldElement;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.BigIntegers;
/**
- * Test class for {@link org.bouncycastle.math.ec.ECPoint ECPoint}. All
+ * Test class for {@link org.spongycastle.math.ec.ECPoint ECPoint}. All
* literature values are taken from "Guide to elliptic curve cryptography",
* Darrel Hankerson, Alfred J. Menezes, Scott Vanstone, 2004, Springer-Verlag
* New York, Inc.
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java b/core/src/test/java/org/spongycastle/math/ec/test/F2mProofer.java
index f113482e..9d7e5195 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/F2mProofer.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/F2mProofer.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.math.ec.test;
+package org.spongycastle.math.ec.test;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -10,16 +10,16 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.asn1.sec.SECNamedCurves;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.math.ec.ECFieldElement;
+import org.spongycastle.math.ec.ECPoint;
public class F2mProofer
{
private static final int NUM_SAMPLES = 1000;
- private static final String PATH = "crypto/test/src/org/bouncycastle/math/ec/test/samples/";
+ private static final String PATH = "crypto/test/src/org/spongycastle/math/ec/test/samples/";
private static final String INPUT_FILE_NAME_PREFIX = "Input_";
diff --git a/core/src/test/java/org/bouncycastle/math/ec/test/TnafTest.java b/core/src/test/java/org/spongycastle/math/ec/test/TnafTest.java
index 9400f6c5..bd527c6f 100644
--- a/core/src/test/java/org/bouncycastle/math/ec/test/TnafTest.java
+++ b/core/src/test/java/org/spongycastle/math/ec/test/TnafTest.java
@@ -1,18 +1,18 @@
-//package org.bouncycastle.math.ec.test;
+//package org.spongycastle.math.ec.test;
//
//import java.math.BigInteger;
//import java.util.Random;
//
//import junit.framework.TestCase;
//
-//import org.bouncycastle.asn1.sec.SECNamedCurves;
-//import org.bouncycastle.asn1.x9.X9ECParameters;
-//import org.bouncycastle.math.ec.ECCurve;
-//import org.bouncycastle.math.ec.ECPoint;
-//import org.bouncycastle.math.ec.NafL2RMultiplier;
-//import org.bouncycastle.math.ec.ReferenceMultiplier;
-//import org.bouncycastle.math.ec.WNafL2RMultiplier;
-//import org.bouncycastle.math.ec.WTauNafMultiplier;
+//import org.spongycastle.asn1.sec.SECNamedCurves;
+//import org.spongycastle.asn1.x9.X9ECParameters;
+//import org.spongycastle.math.ec.ECCurve;
+//import org.spongycastle.math.ec.ECPoint;
+//import org.spongycastle.math.ec.NafL2RMultiplier;
+//import org.spongycastle.math.ec.ReferenceMultiplier;
+//import org.spongycastle.math.ec.WNafL2RMultiplier;
+//import org.spongycastle.math.ec.WTauNafMultiplier;
//
//public class TnafTest extends TestCase
//{
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/AllTests.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/AllTests.java
index 4559fdb9..20c8a154 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testCrypto()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/BitStringTest.java
index 85e1ffaa..449c83eb 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/BitStringTest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.IndexGenerator.BitString;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.pqc.crypto.ntru.IndexGenerator.BitString;
+import org.spongycastle.util.Arrays;
public class BitStringTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/EncryptionKeyTest.java
index f0234063..1b152bff 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/EncryptionKeyTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
public class EncryptionKeyTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/GMSSSignerTest.java
index 69b28428..476322eb 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/GMSSSignerTest.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.DigestingMessageSigner;
-import org.bouncycastle.pqc.crypto.gmss.GMSSDigestProvider;
-import org.bouncycastle.pqc.crypto.gmss.GMSSKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSSigner;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.Signer;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.DigestingMessageSigner;
+import org.spongycastle.pqc.crypto.gmss.GMSSDigestProvider;
+import org.spongycastle.pqc.crypto.gmss.GMSSKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSKeyPairGenerator;
+import org.spongycastle.pqc.crypto.gmss.GMSSParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSSigner;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
public class GMSSSignerTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java
index dfc44b65..d36107c2 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.security.SecureRandom;
import java.util.Random;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
+import org.spongycastle.pqc.crypto.mceliece.McElieceFujisakiDigestCipher;
+import org.spongycastle.util.test.SimpleTest;
public class McElieceFujisakiCipherTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java
index 849e656a..df8d4ed9 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.security.SecureRandom;
import java.util.Random;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKobaraImaiDigestCipher;
+import org.spongycastle.util.test.SimpleTest;
public class McElieceKobaraImaiCipherTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePKCSCipherTest.java
index edb1d607..8578d808 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePKCSCipherTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.security.SecureRandom;
import java.util.Random;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSDigestCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePKCSDigestCipher;
+import org.spongycastle.pqc.crypto.mceliece.McElieceParameters;
+import org.spongycastle.util.test.SimpleTest;
public class McEliecePKCSCipherTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java
index 23ba3f9d..ba41fcfd 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.security.SecureRandom;
import java.util.Random;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePointchevalDigestCipher;
+import org.spongycastle.util.test.SimpleTest;
public class McEliecePointchevalCipherTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptTest.java
index df63a103..f61cb6e8 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptTest.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.IOException;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEngine;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.TernaryPolynomial;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.pqc.crypto.ntru.NTRUEngine;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUParameters;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.Polynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.TernaryPolynomial;
+import org.spongycastle.util.Arrays;
public class NTRUEncryptTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java
index 54f53ad3..c05ea7d0 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
public class NTRUEncryptionParametersTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureKeyTest.java
index 509839a0..f741532c 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureKeyTest.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigner;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningPublicKeyParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigner;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningKeyPairGenerator;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningPublicKeyParameters;
public class NTRUSignatureKeyTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureParametersTest.java
index 4c5751ed..96fa3d4c 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignatureParametersTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
public class NTRUSignatureParametersTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignerTest.java
index 3a765af4..91451e43 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSignerTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSigningParametersTest.java
index 7cf7de83..b9129f00 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/NTRUSigningParametersTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
public class NTRUSigningParametersTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/RainbowSignerTest.java
index ae6774b6..361a80a5 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/RainbowSignerTest.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.DigestingMessageSigner;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowSigner;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.DigestingMessageSigner;
+import org.spongycastle.pqc.crypto.rainbow.RainbowKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.rainbow.RainbowKeyPairGenerator;
+import org.spongycastle.pqc.crypto.rainbow.RainbowParameters;
+import org.spongycastle.pqc.crypto.rainbow.RainbowSigner;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
public class RainbowSignerTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java b/core/src/test/java/org/spongycastle/pqc/crypto/test/RegressionTest.java
index bc5a9794..a081ec89 100644
--- a/core/src/test/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/AllTests.java
index 6302e053..051581f8 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.math.ntru.euclid.test;
+package org.spongycastle.pqc.math.ntru.euclid.test;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java
index 2cb94675..5078090a 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.pqc.math.ntru.euclid.test;
+package org.spongycastle.pqc.math.ntru.euclid.test;
import java.math.BigInteger;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.euclid.BigIntEuclidean;
+import org.spongycastle.pqc.math.ntru.euclid.BigIntEuclidean;
public class BigIntEuclideanTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java
index ab2ba259..9cfa62b0 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java
@@ -20,10 +20,10 @@
* DEALINGS IN THE SOFTWARE.
*/
-package org.bouncycastle.pqc.math.ntru.euclid.test;
+package org.spongycastle.pqc.math.ntru.euclid.test;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.euclid.IntEuclidean;
+import org.spongycastle.pqc.math.ntru.euclid.IntEuclidean;
public class IntEuclideanTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/AllTests.java
index 296a66ed..ce9c6d60 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java
index 06e9e043..fdeb6855 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.math.BigDecimal;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigDecimalPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.BigDecimalPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
public class BigDecimalPolynomialTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java
index a6ad36e5..334ece96 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.math.BigInteger;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
public class BigIntPolynomialTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java
index 8f6e489e..1c7fcabf 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.math.BigInteger;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Resultant;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
+import org.spongycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.Resultant;
+import org.spongycastle.util.Arrays;
public class IntegerPolynomialTest
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java
index c8420646..cff9fa74 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.util.Random;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.LongPolynomial2;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.LongPolynomial2;
+import org.spongycastle.util.Arrays;
public class LongPolynomial2Test
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java
index cf91ac27..a5e65341 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.LongPolynomial5;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.LongPolynomial5;
+import org.spongycastle.util.Arrays;
public class LongPolynomial5Test
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java
index 8f931d7a..a30fea4d 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.util.Random;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
public class PolynomialGenerator
{
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java
index 9fbbb981..96506ed4 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
+import org.spongycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
public class ProductFormPolynomialTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java
index 3d434c68..a4d9ce7e 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
+package org.spongycastle.pqc.math.ntru.polynomial.test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.SecureRandom;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
public class SparseTernaryPolynomialTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/AllTests.java
index 55fc973e..ff675a73 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.math.ntru.util.test;
+package org.spongycastle.pqc.math.ntru.util.test;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java b/core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java
index 6dbdea34..ebd96d1c 100644
--- a/core/src/test/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java
+++ b/core/src/test/java/org/spongycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.pqc.math.ntru.util.test;
+package org.spongycastle.pqc.math.ntru.util.test;
import java.security.SecureRandom;
import java.util.Random;
import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.test.PolynomialGenerator;
-import org.bouncycastle.pqc.math.ntru.util.ArrayEncoder;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
+import org.spongycastle.pqc.math.ntru.polynomial.test.PolynomialGenerator;
+import org.spongycastle.pqc.math.ntru.util.ArrayEncoder;
+import org.spongycastle.util.Arrays;
public class ArrayEncoderTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java b/core/src/test/java/org/spongycastle/util/encoders/test/AbstractCoderTest.java
index d103869d..03f0bf77 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/AbstractCoderTest.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/AbstractCoderTest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -7,7 +7,7 @@ import java.util.Random;
import junit.framework.TestCase;
-import org.bouncycastle.util.encoders.Encoder;
+import org.spongycastle.util.encoders.Encoder;
public abstract class AbstractCoderTest extends TestCase
{
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/AllTests.java b/core/src/test/java/org/spongycastle/util/encoders/test/AllTests.java
index 4691a0b0..a31c5ad2 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import junit.framework.*;
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/Base64Test.java b/core/src/test/java/org/spongycastle/util/encoders/test/Base64Test.java
index 3c053999..f74f7eed 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/Base64Test.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/Base64Test.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import java.io.IOException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Base64Encoder;
-import org.bouncycastle.util.encoders.DecoderException;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Base64Encoder;
+import org.spongycastle.util.encoders.DecoderException;
+import org.spongycastle.util.encoders.Hex;
public class Base64Test extends AbstractCoderTest
{
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/EncoderTest.java b/core/src/test/java/org/spongycastle/util/encoders/test/EncoderTest.java
index c28b9328..4e0e79c2 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/EncoderTest.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/EncoderTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import java.util.Arrays;
import java.util.Random;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.util.encoders.Base64;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.SimpleTest;
public class EncoderTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/HexTest.java b/core/src/test/java/org/spongycastle/util/encoders/test/HexTest.java
index 34af71f0..a0c101bc 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/HexTest.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/HexTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import java.io.IOException;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.DecoderException;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.encoders.HexEncoder;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.DecoderException;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.encoders.HexEncoder;
public class HexTest extends AbstractCoderTest
{
diff --git a/core/src/test/java/org/bouncycastle/util/encoders/test/UrlBase64Test.java b/core/src/test/java/org/spongycastle/util/encoders/test/UrlBase64Test.java
index fbe1fc17..9822efea 100644
--- a/core/src/test/java/org/bouncycastle/util/encoders/test/UrlBase64Test.java
+++ b/core/src/test/java/org/spongycastle/util/encoders/test/UrlBase64Test.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.util.encoders.test;
+package org.spongycastle.util.encoders.test;
import java.io.IOException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.DecoderException;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.encoders.UrlBase64;
-import org.bouncycastle.util.encoders.UrlBase64Encoder;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.DecoderException;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.encoders.UrlBase64;
+import org.spongycastle.util.encoders.UrlBase64Encoder;
public class UrlBase64Test extends AbstractCoderTest
{
diff --git a/core/src/test/java/org/bouncycastle/util/io/pem/test/AllTests.java b/core/src/test/java/org/spongycastle/util/io/pem/test/AllTests.java
index c3460833..6c04ace6 100644
--- a/core/src/test/java/org/bouncycastle/util/io/pem/test/AllTests.java
+++ b/core/src/test/java/org/spongycastle/util/io/pem/test/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util.io.pem.test;
+package org.spongycastle.util.io.pem.test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -10,9 +10,9 @@ import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.io.pem.PemHeader;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemWriter;
+import org.spongycastle.util.io.pem.PemHeader;
+import org.spongycastle.util.io.pem.PemObject;
+import org.spongycastle.util.io.pem.PemWriter;
public class AllTests
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/util/io/test/BufferingOutputStreamTest.java b/core/src/test/java/org/spongycastle/util/io/test/BufferingOutputStreamTest.java
index 0fb6546d..faaaa532 100644
--- a/core/src/test/java/org/bouncycastle/util/io/test/BufferingOutputStreamTest.java
+++ b/core/src/test/java/org/spongycastle/util/io/test/BufferingOutputStreamTest.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.util.io.test;
+package org.spongycastle.util.io.test;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.security.SecureRandom;
-import org.bouncycastle.util.io.BufferingOutputStream;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.util.io.BufferingOutputStream;
+import org.spongycastle.util.test.SimpleTest;
public class BufferingOutputStreamTest
extends SimpleTest
diff --git a/core/src/test/java/org/bouncycastle/util/utiltest/AllTests.java b/core/src/test/java/org/spongycastle/util/utiltest/AllTests.java
index a1ff2ae7..37c73eb8 100644
--- a/core/src/test/java/org/bouncycastle/util/utiltest/AllTests.java
+++ b/core/src/test/java/org/spongycastle/util/utiltest/AllTests.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.util.utiltest;
+package org.spongycastle.util.utiltest;
import junit.framework.Test;
import junit.framework.TestSuite;
diff --git a/core/src/test/java/org/bouncycastle/util/utiltest/BigIntegersTest.java b/core/src/test/java/org/spongycastle/util/utiltest/BigIntegersTest.java
index d3eef271..f17745ee 100644
--- a/core/src/test/java/org/bouncycastle/util/utiltest/BigIntegersTest.java
+++ b/core/src/test/java/org/spongycastle/util/utiltest/BigIntegersTest.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.util.utiltest;
+package org.spongycastle.util.utiltest;
import java.math.BigInteger;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.IPAddress;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.IPAddress;
+import org.spongycastle.util.encoders.Hex;
public class BigIntegersTest
extends TestCase
diff --git a/core/src/test/java/org/bouncycastle/util/utiltest/IPTest.java b/core/src/test/java/org/spongycastle/util/utiltest/IPTest.java
index 107b3384..93df95b9 100644
--- a/core/src/test/java/org/bouncycastle/util/utiltest/IPTest.java
+++ b/core/src/test/java/org/spongycastle/util/utiltest/IPTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.util.utiltest;
+package org.spongycastle.util.utiltest;
import junit.framework.TestCase;
-import org.bouncycastle.util.IPAddress;
+import org.spongycastle.util.IPAddress;
public class IPTest
extends TestCase
diff --git a/core/src/test/javadoc/org/bouncycastle/asn1/test/package.html b/core/src/test/javadoc/org/spongycastle/asn1/test/package.html
index df45e190..df45e190 100644
--- a/core/src/test/javadoc/org/bouncycastle/asn1/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/asn1/test/package.html
diff --git a/core/src/test/javadoc/org/bouncycastle/cms/test/package.html b/core/src/test/javadoc/org/spongycastle/cms/test/package.html
index 153bbd0a..a2429199 100644
--- a/core/src/test/javadoc/org/bouncycastle/cms/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/cms/test/package.html
@@ -1,6 +1,6 @@
<html>
<body bgcolor="#ffffff">
-Regression tests for the org.bouncycastle.cms package.
+Regression tests for the org.spongycastle.cms package.
<p>
<b>Note</b>: The classes in this package are also a useful source of example code.
</body>
diff --git a/core/src/test/javadoc/org/bouncycastle/crypto/test/package.html b/core/src/test/javadoc/org/spongycastle/crypto/test/package.html
index 7bb5e6b1..7bb5e6b1 100644
--- a/core/src/test/javadoc/org/bouncycastle/crypto/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/crypto/test/package.html
diff --git a/core/src/test/javadoc/org/bouncycastle/crypto/tls/package.html b/core/src/test/javadoc/org/spongycastle/crypto/tls/package.html
index ee59f8af..ee59f8af 100644
--- a/core/src/test/javadoc/org/bouncycastle/crypto/tls/package.html
+++ b/core/src/test/javadoc/org/spongycastle/crypto/tls/package.html
diff --git a/core/src/test/javadoc/org/bouncycastle/mail/smime/test/package.html b/core/src/test/javadoc/org/spongycastle/mail/smime/test/package.html
index 25666a16..ba0911ef 100644
--- a/core/src/test/javadoc/org/bouncycastle/mail/smime/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/mail/smime/test/package.html
@@ -1,6 +1,6 @@
<html>
<body bgcolor="#ffffff">
-Regression tests for the org.bouncycastle.mail.smime package.
+Regression tests for the org.spongycastle.mail.smime package.
<p>
<b>Note</b>: The classes in this package are also a useful source of example code.
</body>
diff --git a/core/src/test/javadoc/org/bouncycastle/mozilla/test/package.html b/core/src/test/javadoc/org/spongycastle/mozilla/test/package.html
index 54047adc..54047adc 100644
--- a/core/src/test/javadoc/org/bouncycastle/mozilla/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/mozilla/test/package.html
diff --git a/core/src/test/javadoc/org/bouncycastle/ocsp/test/package.html b/core/src/test/javadoc/org/spongycastle/ocsp/test/package.html
index 6ce2e3a0..6ce2e3a0 100644
--- a/core/src/test/javadoc/org/bouncycastle/ocsp/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/ocsp/test/package.html
diff --git a/core/src/test/javadoc/org/bouncycastle/openpgp/test/package.html b/core/src/test/javadoc/org/spongycastle/openpgp/test/package.html
index b3244792..f7da1f81 100644
--- a/core/src/test/javadoc/org/bouncycastle/openpgp/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/openpgp/test/package.html
@@ -1,6 +1,6 @@
<html>
<body bgcolor="#ffffff">
-Regression tests and further examples of use for the org.bouncycastle.openpgp package.
+Regression tests and further examples of use for the org.spongycastle.openpgp package.
<p>
<b>Note</b>: The classes in this package are also a useful source of example code.
</body>
diff --git a/core/src/test/javadoc/org/bouncycastle/openssl/test/package.html b/core/src/test/javadoc/org/spongycastle/openssl/test/package.html
index 368d7096..368d7096 100644
--- a/core/src/test/javadoc/org/bouncycastle/openssl/test/package.html
+++ b/core/src/test/javadoc/org/spongycastle/openssl/test/package.html
diff --git a/core/src/test/jdk1.2/org/bouncycastle/asn1/test/RegressionTest.java b/core/src/test/jdk1.1/org/spongycastle/asn1/test/RegressionTest.java
index 6d827c6f..01633bd3 100644
--- a/core/src/test/jdk1.2/org/bouncycastle/asn1/test/RegressionTest.java
+++ b/core/src/test/jdk1.1/org/spongycastle/asn1/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/jdk1.1/org/bouncycastle/crypto/test/RegressionTest.java b/core/src/test/jdk1.1/org/spongycastle/crypto/test/RegressionTest.java
index 230145df..424fe49d 100644
--- a/core/src/test/jdk1.1/org/bouncycastle/crypto/test/RegressionTest.java
+++ b/core/src/test/jdk1.1/org/spongycastle/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/jdk1.1/org/bouncycastle/asn1/test/RegressionTest.java b/core/src/test/jdk1.2/org/spongycastle/asn1/test/RegressionTest.java
index 6d827c6f..01633bd3 100644
--- a/core/src/test/jdk1.1/org/bouncycastle/asn1/test/RegressionTest.java
+++ b/core/src/test/jdk1.2/org/spongycastle/asn1/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/jdk1.2/org/bouncycastle/crypto/test/RegressionTest.java b/core/src/test/jdk1.2/org/spongycastle/crypto/test/RegressionTest.java
index b7b6158b..7bf7fd64 100644
--- a/core/src/test/jdk1.2/org/bouncycastle/crypto/test/RegressionTest.java
+++ b/core/src/test/jdk1.2/org/spongycastle/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/jdk1.3/org/bouncycastle/crypto/test/DSATest.java b/core/src/test/jdk1.3/org/spongycastle/crypto/test/DSATest.java
index e0ffe858..d1d835d8 100644
--- a/core/src/test/jdk1.3/org/bouncycastle/crypto/test/DSATest.java
+++ b/core/src/test/jdk1.3/org/spongycastle/crypto/test/DSATest.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
import java.math.BigInteger;
import java.security.SecureRandom;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DSAKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.params.DSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameterGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.params.DSAValidationParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.DSAKeyPairGenerator;
+import org.spongycastle.crypto.generators.DSAParametersGenerator;
+import org.spongycastle.crypto.params.DSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameterGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.crypto.params.DSAValidationParameters;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.DSASigner;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.encoders.Hex;
+import org.spongycastle.util.test.FixedSecureRandom;
+import org.spongycastle.util.test.SimpleTest;
/**
* Test based on FIPS 186-2, Appendix 5, an example of DSA, and FIPS 168-3 test vectors.
diff --git a/core/src/test/jdk1.3/org/bouncycastle/i18n/test/AllTests.java b/core/src/test/jdk1.3/org/spongycastle/i18n/test/AllTests.java
index 28239554..3784fd7b 100644
--- a/core/src/test/jdk1.3/org/bouncycastle/i18n/test/AllTests.java
+++ b/core/src/test/jdk1.3/org/spongycastle/i18n/test/AllTests.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.i18n.test;
+package org.spongycastle.i18n.test;
-import org.bouncycastle.i18n.filter.test.HTMLFilterTest;
-import org.bouncycastle.i18n.filter.test.SQLFilterTest;
+import org.spongycastle.i18n.filter.test.HTMLFilterTest;
+import org.spongycastle.i18n.filter.test.SQLFilterTest;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/core/src/test/jdk1.4/org/bouncycastle/asn1/test/AllTests.java b/core/src/test/jdk1.4/org/spongycastle/asn1/test/AllTests.java
index 50817f2f..ca75ad28 100644
--- a/core/src/test/jdk1.4/org/bouncycastle/asn1/test/AllTests.java
+++ b/core/src/test/jdk1.4/org/spongycastle/asn1/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.asn1.test;
+package org.spongycastle.asn1.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testASN1()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
for (int i = 0; i != tests.length; i++)
{
diff --git a/core/src/test/jdk1.4/org/bouncycastle/crypto/test/RegressionTest.java b/core/src/test/jdk1.4/org/spongycastle/crypto/test/RegressionTest.java
index b7b6158b..7bf7fd64 100644
--- a/core/src/test/jdk1.4/org/bouncycastle/crypto/test/RegressionTest.java
+++ b/core/src/test/jdk1.4/org/spongycastle/crypto/test/RegressionTest.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.test;
+package org.spongycastle.crypto.test;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
+import org.spongycastle.util.test.Test;
+import org.spongycastle.util.test.TestResult;
public class RegressionTest
{
diff --git a/core/src/test/jdk1.4/org/bouncycastle/pqc/crypto/test/AllTests.java b/core/src/test/jdk1.4/org/spongycastle/pqc/crypto/test/AllTests.java
index 2fd64147..2a7d87e0 100644
--- a/core/src/test/jdk1.4/org/bouncycastle/pqc/crypto/test/AllTests.java
+++ b/core/src/test/jdk1.4/org/spongycastle/pqc/crypto/test/AllTests.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.pqc.crypto.test;
+package org.spongycastle.pqc.crypto.test;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
+import org.spongycastle.util.test.SimpleTestResult;
public class AllTests
extends TestCase
{
public void testCrypto()
{
- org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+ org.spongycastle.util.test.Test[] tests = RegressionTest.tests;
// for (int i = 0; i != tests.length; i++)
// {
diff --git a/core/src/test/resources/org/bouncycastle/asn1/test/masterlist-content.data b/core/src/test/resources/org/spongycastle/asn1/test/masterlist-content.data
index d462f0d8..d462f0d8 100644
--- a/core/src/test/resources/org/bouncycastle/asn1/test/masterlist-content.data
+++ b/core/src/test/resources/org/spongycastle/asn1/test/masterlist-content.data
Binary files differ
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/SCryptTestVectors.txt b/core/src/test/resources/org/spongycastle/crypto/test/SCryptTestVectors.txt
index b050e9f8..b050e9f8 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/SCryptTestVectors.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/SCryptTestVectors.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFCTR_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFCTR_gen.rsp
index 2edf662b..2edf662b 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFCTR_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFCTR_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp
index 02448610..02448610 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineCounter_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp
index 5dcbcdff..5dcbcdff 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFDblPipelineNoCounter_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp
index 42436725..42436725 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackCounter_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp
index 27ecb42d..27ecb42d 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoCounter_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp
index 85f64ae0..85f64ae0 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/KDFFeedbackNoIV_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp b/core/src/test/resources/org/spongycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp
index 8121dc64..8121dc64 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp
+++ b/core/src/test/resources/org/spongycastle/crypto/test/cavp/[original]_KDFCTR_gen.rsp
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-128.txt b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-128.txt
index fbc2fbd3..fbc2fbd3 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-128.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-128.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt
index 6460df61..6460df61 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_128IV.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt
index a4784eda..a4784eda 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_128K_256IV.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt
index 46a86d7d..46a86d7d 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_128IV.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt
index 15554076..15554076 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/test/ecrypt_HC-256_256K_256IV.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/README.txt b/core/src/test/resources/org/spongycastle/crypto/tls/test/README.txt
index 2f456ed6..2f456ed6 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/README.txt
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/README.txt
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/ca.tmpl b/core/src/test/resources/org/spongycastle/crypto/tls/test/ca.tmpl
index 44319d2d..44319d2d 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/ca.tmpl
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/ca.tmpl
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/client.tmpl b/core/src/test/resources/org/spongycastle/crypto/tls/test/client.tmpl
index f7f7e08a..f7f7e08a 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/client.tmpl
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/client.tmpl
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/server.tmpl b/core/src/test/resources/org/spongycastle/crypto/tls/test/server.tmpl
index e406c48b..e406c48b 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/server.tmpl
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/server.tmpl
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca-key.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca-key.pem
index b9144d2b..b9144d2b 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca-key.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca-key.pem
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca.pem
index 1639512b..1639512b 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-ca.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-ca.pem
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client-key.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client-key.pem
index 386711f9..386711f9 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client-key.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client-key.pem
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client.pem
index 4f234199..4f234199 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-client.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-client.pem
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server-key.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server-key.pem
index 894fbb99..894fbb99 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server-key.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server-key.pem
diff --git a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server.pem b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server.pem
index efc80696..efc80696 100644
--- a/core/src/test/resources/org/bouncycastle/crypto/tls/test/x509-server.pem
+++ b/core/src/test/resources/org/spongycastle/crypto/tls/test/x509-server.pem
diff --git a/core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_de.properties b/core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_de.properties
index 47bafc63..47bafc63 100644
--- a/core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_de.properties
+++ b/core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_de.properties
diff --git a/core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_en.properties b/core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_en.properties
index 5d243a0d..5d243a0d 100644
--- a/core/src/test/resources/org/bouncycastle/i18n/test/I18nTestMessages_en.properties
+++ b/core/src/test/resources/org/spongycastle/i18n/test/I18nTestMessages_en.properties
diff --git a/core/src/test/resources/org/bouncycastle/i18n/test/I18nUTF8TestMessages_de.properties b/core/src/test/resources/org/spongycastle/i18n/test/I18nUTF8TestMessages_de.properties
index 3fe32f8a..3fe32f8a 100644
--- a/core/src/test/resources/org/bouncycastle/i18n/test/I18nUTF8TestMessages_de.properties
+++ b/core/src/test/resources/org/spongycastle/i18n/test/I18nUTF8TestMessages_de.properties
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 16:43:36 +0300