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

gitlab.com/quite/humla-spongycastle.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'prov/src/main/java')
-rw-r--r--prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java8
-rw-r--r--prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/io/CipherInputStream.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/io/CipherOutputStream.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/io/MacOutputStream.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DH.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSA.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSTU4145.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/EC.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ECGOST.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ElGamal.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/GOST.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/IES.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/RSA.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/X509.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/IESCipher.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java)56
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSASigner.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java)62
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java)70
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java)80
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java)34
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java)34
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java)68
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java)72
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/IESCipher.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java)64
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java)56
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java)38
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java)38
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java)48
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java)80
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java)68
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java)34
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java)36
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java)38
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/CipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java)54
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DHUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DHUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSABase.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSABase.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSAEncoder.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSAEncoder.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/EC5Util.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ECUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java)42
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/GOST3410Util.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/IESUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/KeyUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/KeyUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/KeyFactory.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/KeyFactory.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PEMUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PEMUtil.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java)44
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java)72
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/config/ConfigurableProvider.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/config/ConfigurableProvider.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/config/PKCS12StoreParameter.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/config/PKCS12StoreParameter.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfiguration.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfiguration.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfigurationPermission.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfigurationPermission.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/BCMessageDigest.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/BCMessageDigest.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/DigestAlgorithmProvider.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/DigestAlgorithmProvider.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/GOST3411.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD2.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD4.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD5.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD5.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD128.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD160.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD256.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD320.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA1.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA1.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA224.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA224.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA256.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA3.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA384.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA512.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/SM3.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/Skein.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/Tiger.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/digest/Whirlpool.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/keystore/BC.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/keystore/PKCS12.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java)118
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/AES.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java)62
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ARC4.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Blowfish.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST5.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST6.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Camellia.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java)42
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ChaCha.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DES.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java)60
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DESede.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java)44
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/GOST28147.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grain128.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grainv1.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC128.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC256.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/IDEA.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java)36
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Noekeon.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPBKDF2.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPKCS12.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPKCS12.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC2.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java)42
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC5.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC6.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java)40
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Rijndael.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SEED.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java)40
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Salsa20.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Serpent.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Shacal2.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SipHash.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Skipjack.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/TEA.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Threefish.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Twofish.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPC.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPCKSA3.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XSalsa20.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XTEA.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BCPBEKey.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BCPBEKey.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java)92
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseMac.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java8
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBE.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java)34
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/util/AlgorithmProvider.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/util/AlgorithmProvider.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/util/DigestFactory.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/provider/util/SecretKeyUtil.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/provider/util/SecretKeyUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/spec/GOST28147ParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/spec/PBKDF2KeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/spec/PBKDF2KeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/spec/RepeatedSecretKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/spec/SkeinParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java)44
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/util/DefaultJcaJceHelper.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/util/JcaJceHelper.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceHelper.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/util/JcaJceUtils.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/util/NamedJcaJceHelper.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/util/NamedJcaJceHelper.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jcajce/util/ProviderJcaJceHelper.java (renamed from prov/src/main/java/org/bouncycastle/jcajce/util/ProviderJcaJceHelper.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/ECGOST3410NamedCurveTable.java (renamed from prov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jce/ECKeyUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jce/ECNamedCurveTable.java (renamed from prov/src/main/java/org/bouncycastle/jce/ECNamedCurveTable.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/ECPointUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/ECPointUtil.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/MultiCertStoreParameters.java (renamed from prov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/PKCS10CertificationRequest.java (renamed from prov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java)52
-rw-r--r--prov/src/main/java/org/spongycastle/jce/PKCS12Util.java (renamed from prov/src/main/java/org/bouncycastle/jce/PKCS12Util.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jce/PrincipalUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/PrincipalUtil.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jce/X509KeyUsage.java (renamed from prov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/jce/X509LDAPCertStoreParameters.java (renamed from prov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/X509Principal.java (renamed from prov/src/main/java/org/bouncycastle/jce/X509Principal.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathBuilderException.java (renamed from prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathBuilderException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathValidatorException.java (renamed from prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathValidatorException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/exception/ExtCertificateEncodingException.java (renamed from prov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/exception/ExtException.java (renamed from prov/src/main/java/org/bouncycastle/jce/exception/ExtException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/exception/ExtIOException.java (renamed from prov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/BCKeyStore.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ECKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ECKey.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ECPointEncoder.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ECPointEncoder.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ECPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ECPrivateKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ECPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ECPublicKey.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalKey.java8
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Key.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Params.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/IESKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/MQVPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/MQVPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/interfaces/PKCS12BagAttributeCarrier.java (renamed from prov/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/netscape/NetscapeCertRequest.java (renamed from prov/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/AnnotatedException.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProvider.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java)82
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProviderConfiguration.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java)40
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/BrokenPBE.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/CertPathValidatorUtilities.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java)78
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/CertStatus.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/CertStatus.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/CertStoreCollectionSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/DHUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/DHUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/ExtCRLException.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/ExtCRLException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEDHPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEDHPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEECPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java)64
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEECPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java)80
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCERSAPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JCEStreamCipher.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12StoreParameter.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/MultiCertStoreSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PEMUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PEMUtil.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXCRLUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidator.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidatorException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/PKIXPolicyNode.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java)58
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java)34
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/ReasonsMask.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509AttrCertParser.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CRLEntryObject.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CRLObject.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java)40
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CRLParser.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CertPairParser.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CertParser.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509CertificateObject.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java)68
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509LDAPCertStoreSpi.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509SignatureUtil.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreCRLCollection.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertCollection.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertPairCollection.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPAttrCerts.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCRLs.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCertPairs.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCerts.java (renamed from prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveGenParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveGenParameterSpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveParameterSpec.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveSpec.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECParameterSpec.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECPrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECPrivateKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ECPublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ECPublicKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ElGamalGenParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ElGamalKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ElGamalParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ElGamalPrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/ElGamalPublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/GOST28147ParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/GOST3410ParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/GOST3410PrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/IEKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/IESParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/MQVPrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/MQVPublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/jce/spec/RepeatedSecretKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/McEliece.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/Rainbow.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java)14
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java)28
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java)30
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/CipherSpiExt.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/KeyUtil.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java)16
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowParameterSpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java (renamed from prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/AttributeCertificateHolder.java (renamed from prov/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java)38
-rw-r--r--prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java (renamed from prov/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java)20
-rw-r--r--prov/src/main/java/org/spongycastle/x509/CertPathReviewerException.java (renamed from prov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/x509/ExtCertificateEncodingException.java (renamed from prov/src/main/java/org/bouncycastle/x509/ExtCertificateEncodingException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java (renamed from prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXBuilderParameters.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/x509/ExtendedPKIXParameters.java (renamed from prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/x509/NoSuchParserException.java (renamed from prov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/NoSuchStoreException.java (renamed from prov/src/main/java/org/bouncycastle/x509/NoSuchStoreException.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/PKIXAttrCertChecker.java (renamed from prov/src/main/java/org/bouncycastle/x509/PKIXAttrCertChecker.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/PKIXCertPathReviewer.java (renamed from prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java)90
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509Attribute.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509Attribute.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509AttributeCertStoreSelector.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java)26
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509AttributeCertificate.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509CRLStoreSelector.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509CRLStoreSelector.java)18
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509CertPairStoreSelector.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java)10
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509CertStoreSelector.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509CertStoreSelector.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509CertificatePair.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java)12
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509CollectionStoreParameters.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509CollectionStoreParameters.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509Store.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509Store.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509StoreParameters.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509StoreParameters.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509StoreSpi.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509StoreSpi.java)4
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509StreamParser.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509StreamParser.java)8
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509StreamParserSpi.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java)6
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509Util.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509Util.java)32
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509V1CertificateGenerator.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java)52
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509V2AttributeCertificate.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509V2CRLGenerator.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java)60
-rw-r--r--prov/src/main/java/org/spongycastle/x509/X509V3CertificateGenerator.java (renamed from prov/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java)56
-rw-r--r--prov/src/main/java/org/spongycastle/x509/extension/AuthorityKeyIdentifierStructure.java (renamed from prov/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java)24
-rw-r--r--prov/src/main/java/org/spongycastle/x509/extension/X509ExtensionUtil.java (renamed from prov/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java)22
-rw-r--r--prov/src/main/java/org/spongycastle/x509/util/LDAPStoreHelper.java (renamed from prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java)40
-rw-r--r--prov/src/main/java/org/spongycastle/x509/util/StreamParser.java (renamed from prov/src/main/java/org/bouncycastle/x509/util/StreamParser.java)2
-rw-r--r--prov/src/main/java/org/spongycastle/x509/util/StreamParsingException.java (renamed from prov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java)2
371 files changed, 3558 insertions, 3558 deletions
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java b/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java
deleted file mode 100644
index f5ab9ad0..00000000
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
-
-import org.bouncycastle.crypto.BlockCipher;
-
-public interface BlockCipherProvider
-{
- BlockCipher get();
-}
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java b/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java
deleted file mode 100644
index e6394836..00000000
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-
-public interface ElGamalKey
-{
- public ElGamalParameterSpec getParameters();
-}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java b/prov/src/main/java/org/spongycastle/jcajce/io/CipherInputStream.java
index 84291bab..e3254dc5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/io/CipherInputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.io;
+package org.spongycastle.jcajce.io;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -9,7 +9,7 @@ import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
+import org.spongycastle.crypto.io.InvalidCipherTextIOException;
/**
* A CipherInputStream is composed of an InputStream and a cipher so that read() methods return data
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java b/prov/src/main/java/org/spongycastle/jcajce/io/CipherOutputStream.java
index 814b3392..1139135c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/io/CipherOutputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.io;
+package org.spongycastle.jcajce.io;
import java.io.FilterOutputStream;
import java.io.IOException;
@@ -9,7 +9,7 @@ import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
+import org.spongycastle.crypto.io.InvalidCipherTextIOException;
/**
* A CipherOutputStream is composed of an OutputStream and a cipher so that write() methods process
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java b/prov/src/main/java/org/spongycastle/jcajce/io/MacOutputStream.java
index 235bfe57..ea3d76d9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/io/MacOutputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.io;
+package org.spongycastle.jcajce.io;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DH.java
index 5b6b8c49..e14ec801 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DH.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class DH
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".dh.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".dh.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSA.java
index 2efffbf4..acceacd7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSA.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.dsa.DSAUtil;
+import org.spongycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
public class DSA
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".dsa.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".dsa.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSTU4145.java
index bdf167d2..5e82f2ca 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/DSTU4145.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.dstu.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.asn1.ua.UAObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.dstu.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class DSTU4145
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".dstu.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".dstu.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/EC.java
index d7b437cb..178a301e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/EC.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.asn1.bsi.BSIObjectIdentifiers;
+import org.spongycastle.asn1.eac.EACObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class EC
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".ec.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".ec.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ECGOST.java
index d33126bf..cefae1a2 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ECGOST.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.ecgost.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.ecgost.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class ECGOST
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".ecgost.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".ecgost.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ElGamal.java
index 8dfeed08..e2f44880 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ElGamal.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.elgamal.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.elgamal.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
public class ElGamal
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".elgamal.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".elgamal.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/GOST.java
index 39ab20d3..39e149b7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/GOST.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.gost.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.gost.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class GOST
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".gost.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".gost.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/IES.java
index 47cf3f60..89c43806 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/IES.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class IES
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".ies.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".ies.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/RSA.java
index 438164b5..5087d1ee 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/RSA.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+package org.spongycastle.jcajce.provider.asymmetric;
+
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
public class RSA
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".rsa.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.asymmetric" + ".rsa.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/X509.java
index 5cbee906..6b5a9779 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/X509.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
+package org.spongycastle.jcajce.provider.asymmetric;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
/**
* For some reason the class path project thinks that such a KeyFactory will exist.
@@ -18,13 +18,13 @@ public class X509
public void configure(ConfigurableProvider provider)
{
- provider.addAlgorithm("KeyFactory.X.509", "org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory");
+ provider.addAlgorithm("KeyFactory.X.509", "org.spongycastle.jcajce.provider.asymmetric.x509.KeyFactory");
provider.addAlgorithm("Alg.Alias.KeyFactory.X509", "X.509");
//
// certificate factories.
//
- provider.addAlgorithm("CertificateFactory.X.509", "org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory");
+ provider.addAlgorithm("CertificateFactory.X.509", "org.spongycastle.jcajce.provider.asymmetric.x509.CertificateFactory");
provider.addAlgorithm("Alg.Alias.CertificateFactory.X509", "X.509");
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java
index 8bdcc551..0b394287 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParameterGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -8,9 +8,9 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.DHGenParameterSpec;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.crypto.generators.DHParametersGenerator;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.generators.DHParametersGenerator;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class AlgorithmParameterGeneratorSpi
extends java.security.AlgorithmParameterGeneratorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java
index c7711238..ae89fba9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/AlgorithmParametersSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -6,8 +6,8 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.pkcs.DHParameter;
public class AlgorithmParametersSpi
extends java.security.AlgorithmParametersSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java
index d5516dce..9949a58d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,20 +10,20 @@ import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPrivateKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x9.DHDomainParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class BCDHPrivateKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java
index 0697f757..26d261ab 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/BCDHPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,17 +9,17 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.DHDomainParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
public class BCDHPublicKey
implements DHPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/IESCipher.java
index c29ff2dc..6857f24a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/IESCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.io.ByteArrayOutputStream;
import java.security.AlgorithmParameters;
@@ -21,33 +21,33 @@ import javax.crypto.interfaces.DHKey;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.interfaces.DHPublicKey;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHKeyParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.parsers.DHIESPublicKeyParser;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.KeyEncoder;
+import org.spongycastle.crypto.agreement.DHBasicAgreement;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.IESEngine;
+import org.spongycastle.crypto.generators.DHKeyPairGenerator;
+import org.spongycastle.crypto.generators.EphemeralKeyPairGenerator;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.DHKeyGenerationParameters;
+import org.spongycastle.crypto.params.DHKeyParameters;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.crypto.params.IESParameters;
+import org.spongycastle.crypto.params.IESWithCipherParameters;
+import org.spongycastle.crypto.parsers.DHIESPublicKeyParser;
+import org.spongycastle.jcajce.provider.asymmetric.util.DHUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.IESUtil;
+import org.spongycastle.jce.interfaces.IESKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.util.BigIntegers;
+import org.spongycastle.util.Strings;
public class IESCipher
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java
index f2b5314f..63127236 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyAgreementSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -15,9 +15,9 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.crypto.params.DESParameters;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.Strings;
/**
* Diffie-Hellman key agreement. There's actually a better way of doing this
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java
index 9565bd2d..92ccdd3e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -13,12 +13,12 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHPrivateKeySpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
public class KeyFactorySpi
extends BaseKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java
index 48da0203..67b0d5dc 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dh/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
+package org.spongycastle.jcajce.provider.asymmetric.dh;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPair;
@@ -8,15 +8,15 @@ import java.util.Hashtable;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator;
-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.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.DHBasicKeyPairGenerator;
+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.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Integers;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java
index d850e5de..9bbdca3d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParameterGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,11 +7,11 @@ import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.params.DSAParameterGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.generators.DSAParametersGenerator;
+import org.spongycastle.crypto.params.DSAParameterGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class AlgorithmParameterGeneratorSpi
extends java.security.AlgorithmParameterGeneratorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java
index 61fa33c6..2ace504d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/AlgorithmParametersSpi.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
import java.security.spec.InvalidParameterSpecException;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.DSAParameter;
public class AlgorithmParametersSpi
extends java.security.AlgorithmParametersSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java
index 0fb4bd9e..bcd3dfe8 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,17 +10,17 @@ import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPrivateKeySpec;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class BCDSAPrivateKey
implements DSAPrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java
index e66330b3..f4ccaeae 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/BCDSAPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,15 +9,15 @@ import java.security.interfaces.DSAPublicKey;
import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
public class BCDSAPublicKey
implements DSAPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
index ade49b3d..c2b9e5d3 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.io.IOException;
import java.math.BigInteger;
@@ -11,25 +11,25 @@ import java.security.SignatureSpi;
import java.security.interfaces.DSAKey;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.NullDigest;
-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.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.NullDigest;
+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.ParametersWithRandom;
+import org.spongycastle.crypto.signers.HMacDSAKCalculator;
public class DSASigner
extends SignatureSpi
@@ -217,7 +217,7 @@ public class DSASigner
{
public stdDSA()
{
- super(new SHA1Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new SHA1Digest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
@@ -226,7 +226,7 @@ public class DSASigner
{
public detDSA()
{
- super(new SHA1Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA1Digest())));
+ super(new SHA1Digest(), new org.spongycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA1Digest())));
}
}
@@ -235,7 +235,7 @@ public class DSASigner
{
public dsa224()
{
- super(new SHA224Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new SHA224Digest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
@@ -244,7 +244,7 @@ public class DSASigner
{
public detDSA224()
{
- super(new SHA224Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA224Digest())));
+ super(new SHA224Digest(), new org.spongycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA224Digest())));
}
}
@@ -253,7 +253,7 @@ public class DSASigner
{
public dsa256()
{
- super(new SHA256Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new SHA256Digest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
@@ -262,7 +262,7 @@ public class DSASigner
{
public detDSA256()
{
- super(new SHA256Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA256Digest())));
+ super(new SHA256Digest(), new org.spongycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA256Digest())));
}
}
@@ -271,7 +271,7 @@ public class DSASigner
{
public dsa384()
{
- super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new SHA384Digest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
@@ -280,7 +280,7 @@ public class DSASigner
{
public detDSA384()
{
- super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA384Digest())));
+ super(new SHA384Digest(), new org.spongycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA384Digest())));
}
}
@@ -289,7 +289,7 @@ public class DSASigner
{
public dsa512()
{
- super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new SHA512Digest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
@@ -298,7 +298,7 @@ public class DSASigner
{
public detDSA512()
{
- super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA512Digest())));
+ super(new SHA512Digest(), new org.spongycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA512Digest())));
}
}
@@ -307,7 +307,7 @@ public class DSASigner
{
public noneDSA()
{
- super(new NullDigest(), new org.bouncycastle.crypto.signers.DSASigner());
+ super(new NullDigest(), new org.spongycastle.crypto.signers.DSASigner());
}
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
index 5e940ec1..ae627195 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -6,17 +6,17 @@ import java.security.PublicKey;
import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.DSAPublicKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
/**
* utility class for converting jce/jca DSA objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class DSAUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java
index a36f3dd7..2b5c693e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -12,10 +12,10 @@ import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
public class KeyFactorySpi
extends BaseKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java
index d2c2c712..c67c417f 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dsa/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dsa;
+package org.spongycastle.jcajce.provider.asymmetric.dsa;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidParameterException;
@@ -7,13 +7,13 @@ import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.DSAParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DSAKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.params.DSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.DSAKeyPairGenerator;
+import org.spongycastle.crypto.generators.DSAParametersGenerator;
+import org.spongycastle.crypto.params.DSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.DSAParameters;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java
index 67b151e3..2a70970d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -11,34 +11,34 @@ import java.security.spec.ECPrivateKeySpec;
import java.security.spec.EllipticCurve;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.ua.DSTU4145NamedCurves;
+import org.spongycastle.asn1.ua.UAObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
public class BCDSTU4145PrivateKey
- implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
+ implements ECPrivateKey, org.spongycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
{
static final long serialVersionUID = 7245981689601667138L;
@@ -63,7 +63,7 @@ public class BCDSTU4145PrivateKey
}
public BCDSTU4145PrivateKey(
- org.bouncycastle.jce.spec.ECPrivateKeySpec spec)
+ org.spongycastle.jce.spec.ECPrivateKeySpec spec)
{
this.d = spec.getD();
@@ -135,7 +135,7 @@ public class BCDSTU4145PrivateKey
String algorithm,
ECPrivateKeyParameters params,
BCDSTU4145PublicKey pubKey,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -251,7 +251,7 @@ public class BCDSTU4145PrivateKey
}
else
{
- org.bouncycastle.asn1.sec.ECPrivateKey ec = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
+ org.spongycastle.asn1.sec.ECPrivateKey ec = org.spongycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
this.d = ec.getKey();
this.publicKey = ec.getPublicKey();
@@ -311,15 +311,15 @@ public class BCDSTU4145PrivateKey
}
PrivateKeyInfo info;
- org.bouncycastle.asn1.sec.ECPrivateKey keyStructure;
+ org.spongycastle.asn1.sec.ECPrivateKey keyStructure;
if (publicKey != null)
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
}
else
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), params);
}
try
@@ -347,7 +347,7 @@ public class BCDSTU4145PrivateKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null)
{
@@ -357,7 +357,7 @@ public class BCDSTU4145PrivateKey
return EC5Util.convertSpec(ecSpec, withCompression);
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java
index 11c52a74..891c39da 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,44 +10,44 @@ import java.security.spec.ECPoint;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ua.DSTU4145BinaryField;
-import org.bouncycastle.asn1.ua.DSTU4145ECBinary;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.asn1.ua.DSTU4145Params;
-import org.bouncycastle.asn1.ua.DSTU4145PointEncoder;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.ua.DSTU4145BinaryField;
+import org.spongycastle.asn1.ua.DSTU4145ECBinary;
+import org.spongycastle.asn1.ua.DSTU4145NamedCurves;
+import org.spongycastle.asn1.ua.DSTU4145Params;
+import org.spongycastle.asn1.ua.DSTU4145PointEncoder;
+import org.spongycastle.asn1.ua.UAObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.custom.sec.SecP256K1Point;
+import org.spongycastle.math.ec.custom.sec.SecP256R1Point;
public class BCDSTU4145PublicKey
- implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
+ implements ECPublicKey, org.spongycastle.jce.interfaces.ECPublicKey, ECPointEncoder
{
static final long serialVersionUID = 7026240464295649314L;
private String algorithm = "DSTU4145";
private boolean withCompression;
- private transient org.bouncycastle.math.ec.ECPoint q;
+ private transient org.spongycastle.math.ec.ECPoint q;
private transient ECParameterSpec ecSpec;
private transient DSTU4145Params dstuParams;
@@ -68,7 +68,7 @@ public class BCDSTU4145PublicKey
}
public BCDSTU4145PublicKey(
- org.bouncycastle.jce.spec.ECPublicKeySpec spec)
+ org.spongycastle.jce.spec.ECPublicKeySpec spec)
{
this.q = spec.getQ();
@@ -83,7 +83,7 @@ public class BCDSTU4145PublicKey
{
if (q.getCurve() == null)
{
- org.bouncycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
+ org.spongycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
q = s.getCurve().createPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
@@ -116,7 +116,7 @@ public class BCDSTU4145PublicKey
public BCDSTU4145PublicKey(
String algorithm,
ECPublicKeyParameters params,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -211,7 +211,7 @@ public class BCDSTU4145PublicKey
dstuParams = DSTU4145Params.getInstance((ASN1Sequence)info.getAlgorithm().getParameters());
//ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
- org.bouncycastle.jce.spec.ECParameterSpec spec = null;
+ org.spongycastle.jce.spec.ECParameterSpec spec = null;
if (dstuParams.isNamedCurve())
{
ASN1ObjectIdentifier curveOid = dstuParams.getNamedCurve();
@@ -234,7 +234,7 @@ public class BCDSTU4145PublicKey
{
reverseBytes(g_bytes);
}
- spec = new org.bouncycastle.jce.spec.ECParameterSpec(curve, DSTU4145PointEncoder.decodePoint(curve, g_bytes), binary.getN());
+ spec = new org.spongycastle.jce.spec.ECParameterSpec(curve, DSTU4145PointEncoder.decodePoint(curve, g_bytes), binary.getN());
}
ECCurve curve = spec.getCurve();
@@ -335,7 +335,7 @@ public class BCDSTU4145PublicKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null) // implictlyCA
{
@@ -350,7 +350,7 @@ public class BCDSTU4145PublicKey
return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
- public org.bouncycastle.math.ec.ECPoint getQ()
+ public org.spongycastle.math.ec.ECPoint getQ()
{
if (ecSpec == null)
{
@@ -360,12 +360,12 @@ public class BCDSTU4145PublicKey
return q;
}
- public org.bouncycastle.math.ec.ECPoint engineGetQ()
+ public org.spongycastle.math.ec.ECPoint engineGetQ()
{
return q;
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java
index 95a91dea..995db98c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -10,16 +10,16 @@ import java.security.interfaces.ECPublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.ua.UAObjectIdentifiers;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.ECPrivateKeySpec;
+import org.spongycastle.jce.spec.ECPublicKeySpec;
public class KeyFactorySpi
extends BaseKeyFactorySpi
@@ -62,33 +62,33 @@ public class KeyFactorySpi
return new java.security.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
{
ECPublicKey k = (ECPublicKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
{
ECPrivateKey k = (ECPrivateKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java
index f39eb7fa..4c9cbaa6 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -8,22 +8,22 @@ import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.ECGenParameterSpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DSTU4145KeyPairGenerator;
-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.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ua.DSTU4145NamedCurves;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.DSTU4145KeyPairGenerator;
+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.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java
index 1b9ce706..a6256281 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.math.BigInteger;
import java.security.InvalidKeyException;
@@ -7,21 +7,21 @@ import java.security.PublicKey;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSTU4145Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.DSTU4145Signer;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.interfaces.ECKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class SignatureSpi
extends java.security.SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java
index 0eb8bc93..1b83d55e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
+package org.spongycastle.jcajce.provider.asymmetric.dstu;
import java.io.IOException;
import java.security.SignatureException;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.DEROctetString;
public class SignatureSpiLe
extends SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java
index 45d5b081..451b4b68 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -11,33 +11,33 @@ import java.security.spec.ECPrivateKeySpec;
import java.security.spec.EllipticCurve;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
public class BCECPrivateKey
- implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
+ implements ECPrivateKey, org.spongycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
{
static final long serialVersionUID = 994553197664784084L;
@@ -67,7 +67,7 @@ public class BCECPrivateKey
public BCECPrivateKey(
String algorithm,
- org.bouncycastle.jce.spec.ECPrivateKeySpec spec,
+ org.spongycastle.jce.spec.ECPrivateKeySpec spec,
ProviderConfiguration configuration)
{
this.algorithm = algorithm;
@@ -152,7 +152,7 @@ public class BCECPrivateKey
String algorithm,
ECPrivateKeyParameters params,
BCECPublicKey pubKey,
- org.bouncycastle.jce.spec.ECParameterSpec spec,
+ org.spongycastle.jce.spec.ECParameterSpec spec,
ProviderConfiguration configuration)
{
ECDomainParameters dp = params.getParameters();
@@ -252,7 +252,7 @@ public class BCECPrivateKey
}
else
{
- org.bouncycastle.asn1.sec.ECPrivateKey ec = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
+ org.spongycastle.asn1.sec.ECPrivateKey ec = org.spongycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
this.d = ec.getKey();
this.publicKey = ec.getPublicKey();
@@ -313,15 +313,15 @@ public class BCECPrivateKey
}
PrivateKeyInfo info;
- org.bouncycastle.asn1.sec.ECPrivateKey keyStructure;
+ org.spongycastle.asn1.sec.ECPrivateKey keyStructure;
if (publicKey != null)
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
}
else
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), params);
}
try
@@ -341,7 +341,7 @@ public class BCECPrivateKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null)
{
@@ -351,7 +351,7 @@ public class BCECPrivateKey
return EC5Util.convertSpec(ecSpec, withCompression);
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java
index ac0ddf5b..482776df 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/BCECPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,42 +10,42 @@ import java.security.spec.ECPoint;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-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.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+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.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.custom.sec.SecP256K1Point;
+import org.spongycastle.math.ec.custom.sec.SecP256R1Point;
public class BCECPublicKey
- implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
+ implements ECPublicKey, org.spongycastle.jce.interfaces.ECPublicKey, ECPointEncoder
{
static final long serialVersionUID = 2422789860422731812L;
private String algorithm = "EC";
private boolean withCompression;
- private transient org.bouncycastle.math.ec.ECPoint q;
+ private transient org.spongycastle.math.ec.ECPoint q;
private transient ECParameterSpec ecSpec;
private transient ProviderConfiguration configuration;
@@ -73,7 +73,7 @@ public class BCECPublicKey
public BCECPublicKey(
String algorithm,
- org.bouncycastle.jce.spec.ECPublicKeySpec spec,
+ org.spongycastle.jce.spec.ECPublicKeySpec spec,
ProviderConfiguration configuration)
{
this.algorithm = algorithm;
@@ -92,7 +92,7 @@ public class BCECPublicKey
{
if (q.getCurve() == null)
{
- org.bouncycastle.jce.spec.ECParameterSpec s = configuration.getEcImplicitlyCa();
+ org.spongycastle.jce.spec.ECParameterSpec s = configuration.getEcImplicitlyCa();
q = s.getCurve().createPoint(q.getXCoord().toBigInteger(), q.getYCoord().toBigInteger(), false);
}
@@ -130,7 +130,7 @@ public class BCECPublicKey
public BCECPublicKey(
String algorithm,
ECPublicKeyParameters params,
- org.bouncycastle.jce.spec.ECParameterSpec spec,
+ org.spongycastle.jce.spec.ECParameterSpec spec,
ProviderConfiguration configuration)
{
ECDomainParameters dp = params.getParameters();
@@ -355,7 +355,7 @@ public class BCECPublicKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null) // implictlyCA
{
@@ -370,7 +370,7 @@ public class BCECPublicKey
return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
- public org.bouncycastle.math.ec.ECPoint getQ()
+ public org.spongycastle.math.ec.ECPoint getQ()
{
if (ecSpec == null)
{
@@ -380,12 +380,12 @@ public class BCECPublicKey
return q;
}
- public org.bouncycastle.math.ec.ECPoint engineGetQ()
+ public org.spongycastle.math.ec.ECPoint engineGetQ()
{
return q;
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/IESCipher.java
index ff78d22c..69b61495 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/IESCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.io.ByteArrayOutputStream;
import java.security.AlgorithmParameters;
@@ -18,37 +18,37 @@ import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.ShortBufferException;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-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.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.parsers.ECIESPublicKeyParser;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.KeyEncoder;
+import org.spongycastle.crypto.agreement.ECDHBasicAgreement;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.AESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.IESEngine;
+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.ECKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.crypto.params.IESWithCipherParameters;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.parsers.ECIESPublicKeyParser;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.IESUtil;
+import org.spongycastle.jce.interfaces.ECKey;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.interfaces.IESKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.util.Strings;
public class IESCipher
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
index 4ea57fee..590cd155 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -15,33 +15,33 @@ import javax.crypto.SecretKey;
import javax.crypto.ShortBufferException;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9IntegerConverter;
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECMQVBasicAgreement;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.ECDHKEKGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-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.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.MQVPrivateKey;
-import org.bouncycastle.jce.interfaces.MQVPublicKey;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x9.X9IntegerConverter;
+import org.spongycastle.crypto.BasicAgreement;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.agreement.ECDHBasicAgreement;
+import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
+import org.spongycastle.crypto.agreement.ECMQVBasicAgreement;
+import org.spongycastle.crypto.agreement.kdf.DHKDFParameters;
+import org.spongycastle.crypto.agreement.kdf.ECDHKEKGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.params.DESParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+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.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.interfaces.MQVPrivateKey;
+import org.spongycastle.jce.interfaces.MQVPublicKey;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.Strings;
/**
* Diffie-Hellman key agreement using elliptic curve keys, ala IEEE P1363
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
index 20555c29..5e77a74c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -10,18 +10,18 @@ import java.security.interfaces.ECPublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.ECPrivateKeySpec;
+import org.spongycastle.jce.spec.ECPublicKeySpec;
public class KeyFactorySpi
extends BaseKeyFactorySpi
@@ -88,33 +88,33 @@ public class KeyFactorySpi
return new java.security.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
{
ECPublicKey k = (ECPublicKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
{
ECPrivateKey k = (ECPrivateKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
index ae9be26d..bd24d1aa 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -9,24 +9,24 @@ import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.ECGenParameterSpec;
import java.util.Hashtable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x9.ECNamedCurveTable;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+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.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
+import org.spongycastle.util.Integers;
public abstract class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
index 5e2bb4e4..5846e393 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
+package org.spongycastle.jcajce.provider.asymmetric.ec;
import java.io.IOException;
import java.math.BigInteger;
@@ -6,29 +6,29 @@ import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-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.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.ECNRSigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DSABase;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.NullDigest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+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.ParametersWithRandom;
+import org.spongycastle.crypto.signers.ECDSASigner;
+import org.spongycastle.crypto.signers.ECNRSigner;
+import org.spongycastle.crypto.signers.HMacDSAKCalculator;
+import org.spongycastle.jcajce.provider.asymmetric.util.DSABase;
+import org.spongycastle.jcajce.provider.asymmetric.util.DSAEncoder;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
public class SignatureSpi
extends DSABase
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java
index 9bcc4d41..ca441966 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
+package org.spongycastle.jcajce.provider.asymmetric.ecgost;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -11,39 +11,39 @@ import java.security.spec.ECPrivateKeySpec;
import java.security.spec.EllipticCurve;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.ECGOST3410NamedCurveTable;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
public class BCECGOST3410PrivateKey
- implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
+ implements ECPrivateKey, org.spongycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
{
static final long serialVersionUID = 7245981689601667138L;
@@ -69,7 +69,7 @@ public class BCECGOST3410PrivateKey
}
public BCECGOST3410PrivateKey(
- org.bouncycastle.jce.spec.ECPrivateKeySpec spec)
+ org.spongycastle.jce.spec.ECPrivateKeySpec spec)
{
this.d = spec.getD();
@@ -144,7 +144,7 @@ public class BCECGOST3410PrivateKey
String algorithm,
ECPrivateKeyParameters params,
BCECGOST3410PublicKey pubKey,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -296,7 +296,7 @@ public class BCECGOST3410PrivateKey
}
else
{
- org.bouncycastle.asn1.sec.ECPrivateKey ec = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
+ org.spongycastle.asn1.sec.ECPrivateKey ec = org.spongycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
this.d = ec.getKey();
this.publicKey = ec.getPublicKey();
@@ -376,15 +376,15 @@ public class BCECGOST3410PrivateKey
}
PrivateKeyInfo info;
- org.bouncycastle.asn1.sec.ECPrivateKey keyStructure;
+ org.spongycastle.asn1.sec.ECPrivateKey keyStructure;
if (publicKey != null)
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), publicKey, params);
}
else
{
- keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(this.getS(), params);
+ keyStructure = new org.spongycastle.asn1.sec.ECPrivateKey(this.getS(), params);
}
try
@@ -421,7 +421,7 @@ public class BCECGOST3410PrivateKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null)
{
@@ -431,7 +431,7 @@ public class BCECGOST3410PrivateKey
return EC5Util.convertSpec(ecSpec, withCompression);
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java
index 1240a0ff..9aa744bf 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
+package org.spongycastle.jcajce.provider.asymmetric.ecgost;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,40 +10,40 @@ import java.security.spec.ECPoint;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jce.ECGOST3410NamedCurveTable;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.custom.sec.SecP256K1Point;
+import org.spongycastle.math.ec.custom.sec.SecP256R1Point;
public class BCECGOST3410PublicKey
- implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
+ implements ECPublicKey, org.spongycastle.jce.interfaces.ECPublicKey, ECPointEncoder
{
static final long serialVersionUID = 7026240464295649314L;
private String algorithm = "ECGOST3410";
private boolean withCompression;
- private transient org.bouncycastle.math.ec.ECPoint q;
+ private transient org.spongycastle.math.ec.ECPoint q;
private transient ECParameterSpec ecSpec;
private transient GOST3410PublicKeyAlgParameters gostParams;
@@ -64,7 +64,7 @@ public class BCECGOST3410PublicKey
}
public BCECGOST3410PublicKey(
- org.bouncycastle.jce.spec.ECPublicKeySpec spec)
+ org.spongycastle.jce.spec.ECPublicKeySpec spec)
{
this.q = spec.getQ();
@@ -79,7 +79,7 @@ public class BCECGOST3410PublicKey
{
if (q.getCurve() == null)
{
- org.bouncycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
+ org.spongycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
q = s.getCurve().createPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
@@ -112,7 +112,7 @@ public class BCECGOST3410PublicKey
public BCECGOST3410PublicKey(
String algorithm,
ECPublicKeyParameters params,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -299,7 +299,7 @@ public class BCECGOST3410PublicKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null) // implictlyCA
{
@@ -314,7 +314,7 @@ public class BCECGOST3410PublicKey
return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
- public org.bouncycastle.math.ec.ECPoint getQ()
+ public org.spongycastle.math.ec.ECPoint getQ()
{
if (ecSpec == null)
{
@@ -324,12 +324,12 @@ public class BCECGOST3410PublicKey
return q;
}
- public org.bouncycastle.math.ec.ECPoint engineGetQ()
+ public org.spongycastle.math.ec.ECPoint engineGetQ()
{
return q;
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java
index 61a34be5..1552ff0a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
+package org.spongycastle.jcajce.provider.asymmetric.ecgost;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -10,16 +10,16 @@ import java.security.interfaces.ECPublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.ECPrivateKeySpec;
+import org.spongycastle.jce.spec.ECPublicKeySpec;
public class KeyFactorySpi
extends BaseKeyFactorySpi
@@ -62,33 +62,33 @@ public class KeyFactorySpi
return new java.security.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
{
ECPublicKey k = (ECPublicKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
}
}
- else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
+ else if (spec.isAssignableFrom(org.spongycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
{
ECPrivateKey k = (ECPrivateKey)key;
if (k.getParams() != null)
{
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
}
else
{
ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
- return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
+ return new org.spongycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java
index efd74b4a..5ceefa3d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
+package org.spongycastle.jcajce.provider.asymmetric.ecgost;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -8,20 +8,20 @@ import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.ECGenParameterSpec;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+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.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
index b59db8fa..726dd9fc 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
+package org.spongycastle.jcajce.provider.asymmetric.ecgost;
import java.math.BigInteger;
import java.security.InvalidKeyException;
@@ -7,21 +7,21 @@ import java.security.PublicKey;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECGOST3410Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.GOST3410Key;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.util.GOST3410Util;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.ECGOST3410Signer;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.interfaces.ECKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.interfaces.GOST3410Key;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jcajce.provider.asymmetric.util.GOST3410Util;
public class SignatureSpi
extends java.security.SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java
index 9cb9c87d..332d6db1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -8,9 +8,9 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.DHGenParameterSpec;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.crypto.generators.ElGamalParametersGenerator;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.generators.ElGamalParametersGenerator;
+import org.spongycastle.crypto.params.ElGamalParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class AlgorithmParameterGeneratorSpi
extends java.security.AlgorithmParameterGeneratorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java
index a77f0a40..5a65c0b2 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -6,11 +6,11 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
public class AlgorithmParametersSpi
extends BaseAlgorithmParameters
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java
index f0f83fa4..73a965a7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,20 +10,20 @@ import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPrivateKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.ElGamalPrivateKey;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.jce.spec.ElGamalPrivateKeySpec;
public class BCElGamalPrivateKey
implements ElGamalPrivateKey, DHPrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java
index cd31cc57..86ee5226 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,16 +9,16 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.params.ElGamalPublicKeyParameters;
+import org.spongycastle.jce.interfaces.ElGamalPublicKey;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.jce.spec.ElGamalPublicKeySpec;
public class BCElGamalPublicKey
implements ElGamalPublicKey, DHPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java
index fbf4f754..123b88b5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -19,23 +19,23 @@ import javax.crypto.interfaces.DHKey;
import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.ElGamalEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
-import org.bouncycastle.jce.interfaces.ElGamalKey;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.BufferedAsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.encodings.ISO9796d1Encoding;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.ElGamalEngine;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseCipherSpi;
+import org.spongycastle.jcajce.provider.util.DigestFactory;
+import org.spongycastle.jce.interfaces.ElGamalKey;
+import org.spongycastle.jce.interfaces.ElGamalPrivateKey;
+import org.spongycastle.jce.interfaces.ElGamalPublicKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Strings;
public class CipherSpi
extends BaseCipherSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java
index f0442f4a..65c7c412 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -7,16 +7,16 @@ import java.security.PublicKey;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.interfaces.DHPublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ElGamalParameters;
+import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters;
+import org.spongycastle.crypto.params.ElGamalPublicKeyParameters;
+import org.spongycastle.jce.interfaces.ElGamalPrivateKey;
+import org.spongycastle.jce.interfaces.ElGamalPublicKey;
/**
* utility class for converting jce/jca ElGamal objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class ElGamalUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java
index 92e655f7..03c685e3 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -13,17 +13,17 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHPrivateKeySpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jce.interfaces.ElGamalPrivateKey;
+import org.spongycastle.jce.interfaces.ElGamalPublicKey;
+import org.spongycastle.jce.spec.ElGamalPrivateKeySpec;
+import org.spongycastle.jce.spec.ElGamalPublicKeySpec;
public class KeyFactorySpi
extends BaseKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java
index 9455ece2..9c92b575 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
+package org.spongycastle.jcajce.provider.asymmetric.elgamal;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPair;
@@ -7,15 +7,15 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+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.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java
index 7019b819..0cf5908a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.crypto.generators.GOST3410ParametersGenerator;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.crypto.generators.GOST3410ParametersGenerator;
+import org.spongycastle.crypto.params.GOST3410Parameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
public abstract class AlgorithmParameterGeneratorSpi
extends java.security.AlgorithmParameterGeneratorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java
index 0af98e0b..c046d008 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidParameterSpecException;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
public class AlgorithmParametersSpi
extends java.security.AlgorithmParametersSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java
index 8da49987..13340f1e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -6,24 +6,24 @@ import java.io.ObjectOutputStream;
import java.math.BigInteger;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PrivateKeySpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.GOST3410PrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.GOST3410Params;
+import org.spongycastle.jce.interfaces.GOST3410PrivateKey;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.jce.spec.GOST3410PrivateKeySpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
public class BCGOST3410PrivateKey
implements GOST3410PrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java
index 1729b96d..658715c9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.math.BigInteger;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.params.GOST3410PublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jce.interfaces.GOST3410Params;
+import org.spongycastle.jce.interfaces.GOST3410PublicKey;
+import org.spongycastle.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeySpec;
public class BCGOST3410PublicKey
implements GOST3410PublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java
index ceaf967c..acf1f480 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -8,16 +8,16 @@ import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410PrivateKeySpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeySpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jce.interfaces.GOST3410PrivateKey;
+import org.spongycastle.jce.interfaces.GOST3410PublicKey;
+import org.spongycastle.jce.spec.GOST3410PrivateKeySpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeySpec;
public class KeyFactorySpi
extends BaseKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java
index 0a6a40ec..67ac1b91 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPair;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.GOST3410KeyPairGenerator;
-import org.bouncycastle.crypto.params.GOST3410KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.GOST3410KeyPairGenerator;
+import org.spongycastle.crypto.params.GOST3410KeyGenerationParameters;
+import org.spongycastle.crypto.params.GOST3410Parameters;
+import org.spongycastle.crypto.params.GOST3410PrivateKeyParameters;
+import org.spongycastle.crypto.params.GOST3410PublicKeyParameters;
+import org.spongycastle.jce.spec.GOST3410ParameterSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java
index 30a66601..199af6dc 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
+package org.spongycastle.jcajce.provider.asymmetric.gost;
import java.math.BigInteger;
import java.security.InvalidKeyException;
@@ -8,21 +8,21 @@ import java.security.SecureRandom;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.GOST3410Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.GOST3410Key;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.util.GOST3410Util;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.signers.GOST3410Signer;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.interfaces.ECKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.interfaces.GOST3410Key;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jcajce.provider.asymmetric.util.GOST3410Util;
public class SignatureSpi
extends java.security.SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java
index 61f1e373..f5de87c8 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ies;
+package org.spongycastle.jcajce.provider.asymmetric.ies;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidParameterSpecException;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.jce.spec.IESParameterSpec;
public class AlgorithmParametersSpi
extends java.security.AlgorithmParametersSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
index 8cfaf2a4..9337df04 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ies;
+package org.spongycastle.jcajce.provider.asymmetric.ies;
import java.io.ByteArrayOutputStream;
import java.security.AlgorithmParameters;
@@ -14,21 +14,21 @@ import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.interfaces.DHPrivateKey;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.agreement.DHBasicAgreement;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.IESEngine;
+import org.spongycastle.crypto.generators.KDF2BytesGenerator;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.params.IESParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jcajce.provider.asymmetric.util.DHUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.interfaces.IESKey;
+import org.spongycastle.jce.spec.IESParameterSpec;
public class CipherSpi
extends javax.crypto.CipherSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java
index baee6d52..6402bd28 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/AlgorithmParametersSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -9,16 +9,16 @@ import java.security.spec.PSSParameterSpec;
import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RSAESOAEPparams;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.jcajce.provider.util.DigestFactory;
public abstract class AlgorithmParametersSpi
extends java.security.AlgorithmParametersSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java
index 9b70d74d..31772a14 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateCrtKey.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.IOException;
import java.math.BigInteger;
import java.security.interfaces.RSAPrivateCrtKey;
import java.security.spec.RSAPrivateCrtKeySpec;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
/**
* A provider representation for a RSA private key, with CRT factors included.
@@ -30,7 +30,7 @@ public class BCRSAPrivateCrtKey
private BigInteger crtCoefficient;
/**
- * construct a private key from it's org.bouncycastle.crypto equivalent.
+ * construct a private key from it's org.spongycastle.crypto equivalent.
*
* @param key the parameters object representing the private key.
*/
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java
index b82c5f80..1e63f3b5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -8,15 +8,15 @@ import java.security.interfaces.RSAPrivateKey;
import java.security.spec.RSAPrivateKeySpec;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class BCRSAPrivateKey
implements RSAPrivateKey, PKCS12BagAttributeCarrier
@@ -55,7 +55,7 @@ public class BCRSAPrivateKey
this.privateExponent = key.getPrivateExponent();
}
- BCRSAPrivateKey(org.bouncycastle.asn1.pkcs.RSAPrivateKey key)
+ BCRSAPrivateKey(org.spongycastle.asn1.pkcs.RSAPrivateKey key)
{
this.modulus = key.getModulus();
this.privateExponent = key.getPrivateExponent();
@@ -83,7 +83,7 @@ public class BCRSAPrivateKey
public byte[] getEncoded()
{
- return KeyUtil.getEncodedPrivateKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new org.bouncycastle.asn1.pkcs.RSAPrivateKey(getModulus(), ZERO, getPrivateExponent(), ZERO, ZERO, ZERO, ZERO, ZERO));
+ return KeyUtil.getEncodedPrivateKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new org.spongycastle.asn1.pkcs.RSAPrivateKey(getModulus(), ZERO, getPrivateExponent(), ZERO, ZERO, ZERO, ZERO, ZERO));
}
public boolean equals(Object o)
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java
index 6f5292ce..7a4454c5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/BCRSAPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.EOFException;
import java.io.IOException;
@@ -9,12 +9,12 @@ import java.math.BigInteger;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.RSAPublicKeySpec;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
public class BCRSAPublicKey
implements RSAPublicKey
@@ -61,7 +61,7 @@ public class BCRSAPublicKey
{
try
{
- org.bouncycastle.asn1.pkcs.RSAPublicKey pubKey = org.bouncycastle.asn1.pkcs.RSAPublicKey.getInstance(info.parsePublicKey());
+ org.spongycastle.asn1.pkcs.RSAPublicKey pubKey = org.spongycastle.asn1.pkcs.RSAPublicKey.getInstance(info.parsePublicKey());
this.algorithmIdentifier = info.getAlgorithm();
this.modulus = pubKey.getModulus();
@@ -105,7 +105,7 @@ public class BCRSAPublicKey
public byte[] getEncoded()
{
- return KeyUtil.getEncodedSubjectPublicKeyInfo(algorithmIdentifier, new org.bouncycastle.asn1.pkcs.RSAPublicKey(getModulus(), getPublicExponent()));
+ return KeyUtil.getEncodedSubjectPublicKeyInfo(algorithmIdentifier, new org.spongycastle.asn1.pkcs.RSAPublicKey(getModulus(), getPublicExponent()));
}
public int hashCode()
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
index cabf51b2..6edd4aef 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.ByteArrayOutputStream;
import java.security.AlgorithmParameters;
@@ -21,20 +21,20 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.encodings.ISO9796d1Encoding;
+import org.spongycastle.crypto.encodings.OAEPEncoding;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseCipherSpi;
+import org.spongycastle.jcajce.provider.util.DigestFactory;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Strings;
public class CipherSpi
extends BaseCipherSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
index 44625485..90e3667c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -11,32 +11,32 @@ import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.digests.MD4Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
-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.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DigestInfo;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD2Digest;
+import org.spongycastle.crypto.digests.MD4Digest;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.digests.NullDigest;
+import org.spongycastle.crypto.digests.RIPEMD128Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.digests.RIPEMD256Digest;
+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.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
public class DigestSignatureSpi
extends SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java
index 4d24e96b..9337e6b1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -9,14 +9,14 @@ import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.signers.ISO9796d2Signer;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.signers.ISO9796d2Signer;
public class ISOSignatureSpi
extends SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java
index 80690f7c..fcc973af 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -14,12 +14,12 @@ import java.security.spec.RSAPrivateCrtKeySpec;
import java.security.spec.RSAPrivateKeySpec;
import java.security.spec.RSAPublicKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ExtendedInvalidKeySpecException;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
+import org.spongycastle.jcajce.provider.asymmetric.util.ExtendedInvalidKeySpecException;
public class KeyFactorySpi
extends BaseKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java
index c61e7cb8..1239628e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/KeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.math.BigInteger;
import java.security.InvalidAlgorithmParameterException;
@@ -7,11 +7,11 @@ import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.RSAKeyGenParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.spongycastle.crypto.AsymmetricCipherKeyPair;
+import org.spongycastle.crypto.generators.RSAKeyPairGenerator;
+import org.spongycastle.crypto.params.RSAKeyGenerationParameters;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
public class KeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java
index c0a2fc92..adce8b59 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.io.ByteArrayOutputStream;
import java.security.AlgorithmParameters;
@@ -15,14 +15,14 @@ import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.MGF1ParameterSpec;
import java.security.spec.PSSParameterSpec;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.jcajce.provider.util.DigestFactory;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class PSSSignatureSpi
extends SignatureSpi
@@ -37,14 +37,14 @@ public class PSSSignatureSpi
private byte trailer;
private boolean isRaw;
- private org.bouncycastle.crypto.signers.PSSSigner pss;
+ private org.spongycastle.crypto.signers.PSSSigner pss;
private byte getTrailer(
int trailerField)
{
if (trailerField == 1)
{
- return org.bouncycastle.crypto.signers.PSSSigner.TRAILER_IMPLICIT;
+ return org.spongycastle.crypto.signers.PSSSigner.TRAILER_IMPLICIT;
}
throw new IllegalArgumentException("unknown trailer field");
@@ -105,7 +105,7 @@ public class PSSSignatureSpi
throw new InvalidKeyException("Supplied key is not a RSAPublicKey instance");
}
- pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
+ pss = new org.spongycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
pss.init(false,
RSAUtil.generatePublicKeyParameter((RSAPublicKey)publicKey));
}
@@ -120,7 +120,7 @@ public class PSSSignatureSpi
throw new InvalidKeyException("Supplied key is not a RSAPrivateKey instance");
}
- pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
+ pss = new org.spongycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
pss.init(true, new ParametersWithRandom(RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey), random));
}
@@ -133,7 +133,7 @@ public class PSSSignatureSpi
throw new InvalidKeyException("Supplied key is not a RSAPrivateKey instance");
}
- pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
+ pss = new org.spongycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
pss.init(true, RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey));
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java
index 4943a99b..da57ec3b 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/rsa/RSAUtil.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
+package org.spongycastle.jcajce.provider.asymmetric.rsa;
import java.security.interfaces.RSAPrivateCrtKey;
import java.security.interfaces.RSAPrivateKey;
import java.security.interfaces.RSAPublicKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
/**
* utility class for converting java.security RSA objects into their
- * org.bouncycastle.crypto counterparts.
+ * org.spongycastle.crypto counterparts.
*/
public class RSAUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
index 722a5cae..4c1ed0ee 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.AlgorithmParameters;
import java.security.InvalidKeyException;
@@ -22,10 +22,10 @@ import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public abstract class BaseCipherSpi
extends CipherSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java
index cb34f447..5ced82ec 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/BaseKeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.Key;
import java.security.PrivateKey;
@@ -8,9 +8,9 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
public abstract class BaseKeyFactorySpi
extends java.security.KeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DHUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DHUtil.java
index 52c84ec0..10b633da 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DHUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DHUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -7,14 +7,14 @@ import java.security.PublicKey;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.interfaces.DHPublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
/**
* utility class for converting jce/jca DH objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class DHUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSABase.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSABase.java
index 463de890..0f659b2c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSABase.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSABase.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.math.BigInteger;
import java.security.SignatureException;
import java.security.SignatureSpi;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.DSA;
+import org.spongycastle.crypto.Digest;
public abstract class DSABase
extends SignatureSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSAEncoder.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSAEncoder.java
index 4ea0ff93..349641dd 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/DSAEncoder.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/DSAEncoder.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.io.IOException;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/EC5Util.java
index d5b62fe8..d1f49a80 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/EC5Util.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.math.BigInteger;
import java.security.spec.ECField;
@@ -11,13 +11,13 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.asn1.x9.ECNamedCurveTable;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.ec.CustomNamedCurves;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECAlgorithms;
+import org.spongycastle.math.ec.ECCurve;
public class EC5Util
{
@@ -97,7 +97,7 @@ public class EC5Util
public static ECParameterSpec convertSpec(
EllipticCurve ellipticCurve,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
if (spec instanceof ECNamedCurveParameterSpec)
{
@@ -122,13 +122,13 @@ public class EC5Util
}
}
- public static org.bouncycastle.jce.spec.ECParameterSpec convertSpec(
+ public static org.spongycastle.jce.spec.ECParameterSpec convertSpec(
ECParameterSpec ecSpec,
boolean withCompression)
{
ECCurve curve = convertCurve(ecSpec.getCurve());
- return new org.bouncycastle.jce.spec.ECParameterSpec(
+ return new org.spongycastle.jce.spec.ECParameterSpec(
curve,
convertPoint(curve, ecSpec.getGenerator(), withCompression),
ecSpec.getOrder(),
@@ -136,7 +136,7 @@ public class EC5Util
ecSpec.getCurve().getSeed());
}
- public static org.bouncycastle.math.ec.ECPoint convertPoint(
+ public static org.spongycastle.math.ec.ECPoint convertPoint(
ECParameterSpec ecSpec,
ECPoint point,
boolean withCompression)
@@ -144,7 +144,7 @@ public class EC5Util
return convertPoint(convertCurve(ecSpec.getCurve()), point, withCompression);
}
- public static org.bouncycastle.math.ec.ECPoint convertPoint(
+ public static org.spongycastle.math.ec.ECPoint convertPoint(
ECCurve curve,
ECPoint point,
boolean withCompression)
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ECUtil.java
index 4283273d..c3251a8d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ECUtil.java
@@ -1,32 +1,32 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962NamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.asn1.nist.NISTNamedCurves;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.sec.SECNamedCurves;
+import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962NamedCurves;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.crypto.ec.CustomNamedCurves;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+import org.spongycastle.jce.interfaces.ECPrivateKey;
+import org.spongycastle.jce.interfaces.ECPublicKey;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.spec.ECParameterSpec;
/**
* utility class for converting jce/jca ECDSA, ECDH, and ECDHC
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class ECUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java
index 7945639c..3f39d39e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/ExtendedInvalidKeySpecException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.spec.InvalidKeySpecException;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
index 850ab9dd..c331e3c0 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.GOST3410Parameters;
+import org.spongycastle.crypto.params.GOST3410PrivateKeyParameters;
+import org.spongycastle.crypto.params.GOST3410PublicKeyParameters;
+import org.spongycastle.jce.interfaces.GOST3410PrivateKey;
+import org.spongycastle.jce.interfaces.GOST3410PublicKey;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
/**
* utility class for converting jce/jca GOST3410-94 objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class GOST3410Util
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/IESUtil.java
index 93ed727d..fb93838e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/IESUtil.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.jce.spec.IESParameterSpec;
+import org.spongycastle.crypto.engines.IESEngine;
+import org.spongycastle.jce.spec.IESParameterSpec;
public class IESUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/KeyUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/KeyUtil.java
index 4dff91a2..d1eb6841 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/KeyUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/KeyUtil.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
public class KeyUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java
index 3e328dae..5ae93fdb 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/util/PKCS12BagAttributeCarrierImpl.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
+package org.spongycastle.jcajce.provider.asymmetric.util;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -8,11 +8,11 @@ import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class PKCS12BagAttributeCarrierImpl
implements PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java
index 03a1fe83..1d1dc8c9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.IOException;
import java.io.InputStream;
@@ -15,15 +15,15 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.CertificateList;
/**
* class for dealing with X509 certificates.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java
index e27acfbb..af366acf 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/ExtCRLException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.security.cert.CRLException;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/KeyFactory.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/KeyFactory.java
index a4c701d6..38597048 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/KeyFactory.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/KeyFactory.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -10,9 +10,9 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class KeyFactory
extends KeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PEMUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PEMUtil.java
index e4aaf307..4eb704d9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PEMUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PEMUtil.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.IOException;
import java.io.InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.util.encoders.Base64;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.util.encoders.Base64;
public class PEMUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
index 91d48294..08fd6b0b 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -22,21 +22,21 @@ import java.util.ListIterator;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemWriter;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.pkcs.ContentInfo;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.io.pem.PemObject;
+import org.spongycastle.util.io.pem.PemWriter;
/**
* CertPath implementation for X.509 certificates.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java
index 32e595c2..780cad8c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLEntryObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -11,19 +11,19 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.CRLReason;
-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.TBSCertList;
-import org.bouncycastle.asn1.x509.X509Extension;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.CRLReason;
+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.TBSCertList;
+import org.spongycastle.asn1.x509.X509Extension;
/**
* The following extensions are listed in RFC 2459 as relevant to CRL Entries
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java
index c7d04020..d387c440 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CRLObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -24,26 +24,26 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.RFC3280CertPathUtilities;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLNumber;
+import org.spongycastle.asn1.x509.CertificateList;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.provider.RFC3280CertPathUtilities;
+import org.spongycastle.util.encoders.Hex;
/**
* The following extensions are listed in RFC 2459 as relevant to CRLs
@@ -558,7 +558,7 @@ public class X509CRLObject
{
try
{
- issuer = org.bouncycastle.asn1.x509.Certificate.getInstance(cert.getEncoded()).getIssuer();
+ issuer = org.spongycastle.asn1.x509.Certificate.getInstance(cert.getEncoded()).getIssuer();
}
catch (CertificateEncodingException e)
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
index 44220622..7acb7cad 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,45 +32,45 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-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.ASN1String;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.asn1.misc.NetscapeRevocationURL;
-import org.bouncycastle.asn1.misc.VerisignCzagExtension;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.RFC3280CertPathUtilities;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+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.ASN1String;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.misc.MiscObjectIdentifiers;
+import org.spongycastle.asn1.misc.NetscapeCertType;
+import org.spongycastle.asn1.misc.NetscapeRevocationURL;
+import org.spongycastle.asn1.misc.VerisignCzagExtension;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.style.RFC4519Style;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.KeyUsage;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.provider.RFC3280CertPathUtilities;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.encoders.Hex;
class X509CertificateObject
extends X509Certificate
implements PKCS12BagAttributeCarrier
{
- private org.bouncycastle.asn1.x509.Certificate c;
+ private org.spongycastle.asn1.x509.Certificate c;
private BasicConstraints basicConstraints;
private boolean[] keyUsage;
private boolean hashValueSet;
@@ -79,7 +79,7 @@ class X509CertificateObject
private PKCS12BagAttributeCarrier attrCarrier = new PKCS12BagAttributeCarrierImpl();
public X509CertificateObject(
- org.bouncycastle.asn1.x509.Certificate c)
+ org.spongycastle.asn1.x509.Certificate c)
throws CertificateParsingException
{
this.c = c;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
index 06d30759..6c988b8d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.asymmetric.x509;
+package org.spongycastle.jcajce.provider.asymmetric.x509;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -9,19 +9,19 @@ import java.security.Signature;
import java.security.SignatureException;
import java.security.spec.PSSParameterSpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Null;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
class X509SignatureUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ConfigurableProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ConfigurableProvider.java
index 123ff7de..a9679dc3 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ConfigurableProvider.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ConfigurableProvider.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.config;
+package org.spongycastle.jcajce.provider.config;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
/**
* Implemented by the BC provider. This allows setting of hidden parameters,
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/PKCS12StoreParameter.java b/prov/src/main/java/org/spongycastle/jcajce/provider/config/PKCS12StoreParameter.java
index 36a32b17..c9bbc839 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/PKCS12StoreParameter.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/config/PKCS12StoreParameter.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.config;
+package org.spongycastle.jcajce.provider.config;
import java.io.OutputStream;
import java.security.KeyStore;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfiguration.java b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfiguration.java
index 2d99ed9b..edc4c9ea 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfiguration.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfiguration.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jcajce.provider.config;
+package org.spongycastle.jcajce.provider.config;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
public interface ProviderConfiguration
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfigurationPermission.java b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfigurationPermission.java
index b21afc54..4fb9dcd0 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/config/ProviderConfigurationPermission.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/config/ProviderConfigurationPermission.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.config;
+package org.spongycastle.jcajce.provider.config;
import java.security.BasicPermission;
import java.security.Permission;
import java.util.StringTokenizer;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.util.Strings;
/**
* A permission class to define what can be done with the ConfigurableProvider interface.
@@ -15,10 +15,10 @@ import org.bouncycastle.util.Strings;
* <p>
* Examples:
* <ul>
- * <li>ProviderConfigurationPermission("BC"); // enable all permissions</li>
- * <li>ProviderConfigurationPermission("BC", "threadLocalEcImplicitlyCa"); // enable thread local only</li>
- * <li>ProviderConfigurationPermission("BC", "ecImplicitlyCa"); // enable global setting only</li>
- * <li>ProviderConfigurationPermission("BC", "threadLocalEcImplicitlyCa, ecImplicitlyCa"); // enable both explicitly</li>
+ * <li>ProviderConfigurationPermission("SC"); // enable all permissions</li>
+ * <li>ProviderConfigurationPermission("SC", "threadLocalEcImplicitlyCa"); // enable thread local only</li>
+ * <li>ProviderConfigurationPermission("SC", "ecImplicitlyCa"); // enable global setting only</li>
+ * <li>ProviderConfigurationPermission("SC", "threadLocalEcImplicitlyCa, ecImplicitlyCa"); // enable both explicitly</li>
* </ul>
* <p>
* Note: permission checks are only enforced if a security manager is present.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/BCMessageDigest.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/BCMessageDigest.java
index 3c5b78d7..56fb9f76 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/BCMessageDigest.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/BCMessageDigest.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
import java.security.MessageDigest;
-import org.bouncycastle.crypto.Digest;
+import org.spongycastle.crypto.Digest;
public class BCMessageDigest
extends MessageDigest
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/DigestAlgorithmProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/DigestAlgorithmProvider.java
index 2325f597..ec316d99 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/DigestAlgorithmProvider.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/DigestAlgorithmProvider.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
abstract class DigestAlgorithmProvider
extends AlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/GOST3411.java
index 2112673e..7a20eb01 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/GOST3411.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public class GOST3411
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD2.java
index 5a3a2bf8..ceaa460b 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD2.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.MD2Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class MD2
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD4.java
index 8a30baaf..046e163a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD4.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.MD4Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.MD4Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class MD4
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD5.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD5.java
index 93a7d716..7c070856 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD5.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/MD5.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.iana.IANAObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class MD5
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD128.java
index e913f658..81b51dc2 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD128.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.RIPEMD128Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class RIPEMD128
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD160.java
index f081713a..d4f420fe 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD160.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+package org.spongycastle.jcajce.provider.digest;
+
+import org.spongycastle.asn1.iana.IANAObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public class RIPEMD160
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD256.java
index dcb1b56b..d5e86b4a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD256.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.RIPEMD256Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class RIPEMD256
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD320.java
index 12e0fd8b..ca09b7c2 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/RIPEMD320.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD320Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.RIPEMD320Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class RIPEMD320
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA1.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA1.java
index c7502c77..b8f76ed4 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA1.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA1.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
@@ -6,20 +6,20 @@ import java.security.spec.KeySpec;
import javax.crypto.SecretKey;
import javax.crypto.spec.PBEKeySpec;
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.asn1.iana.IANAObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
+import org.spongycastle.jcajce.provider.symmetric.util.PBE;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public class SHA1
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA224.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA224.java
index ba06a0fb..3a075eab 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA224.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA224.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SHA224Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class SHA224
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA256.java
index 785cf655..f5e092a8 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA256.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public class SHA256
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA3.java
index 2c832fbd..21eedda7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA3.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+package org.spongycastle.jcajce.provider.digest;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SHA3Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class SHA3
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA384.java
index f811df66..dc13adb6 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA384.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.OldHMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SHA384Digest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.macs.OldHMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class SHA384
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA512.java
index 48adf738..3c05b748 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SHA512.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.OldHMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+package org.spongycastle.jcajce.provider.digest;
+
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SHA512Digest;
+import org.spongycastle.crypto.digests.SHA512tDigest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.macs.OldHMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class SHA512
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SM3.java
index 8050e354..46a49945 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/SM3.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.crypto.digests.SM3Digest;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.crypto.digests.SM3Digest;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
public class SM3
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Skein.java
index 11910494..f559bd35 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Skein.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SkeinDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+package org.spongycastle.jcajce.provider.digest;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.SkeinDigest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.crypto.macs.SkeinMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class Skein
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Tiger.java
index 3d248aad..6bb9b283 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Tiger.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.TigerDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+package org.spongycastle.jcajce.provider.digest;
+
+import org.spongycastle.asn1.iana.IANAObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.TigerDigest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public class Tiger
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Whirlpool.java
index bf1c06c6..e42ddf3f 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/digest/Whirlpool.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.digest;
+package org.spongycastle.jcajce.provider.digest;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.WhirlpoolDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.digests.WhirlpoolDigest;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
public class Whirlpool
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/BC.java
index 30a81ffb..ff082c35 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/BC.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.keystore;
+package org.spongycastle.jcajce.provider.keystore;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class BC
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.keystore" + ".bc.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.keystore" + ".bc.";
public static class Mappings
extends AsymmetricAlgorithmProvider
@@ -21,7 +21,7 @@ public class BC
provider.addAlgorithm("KeyStore.BouncyCastle", PREFIX + "BcKeyStoreSpi$BouncyCastleStore");
provider.addAlgorithm("Alg.Alias.KeyStore.UBER", "BouncyCastle");
provider.addAlgorithm("Alg.Alias.KeyStore.BOUNCYCASTLE", "BouncyCastle");
- provider.addAlgorithm("Alg.Alias.KeyStore.bouncycastle", "BouncyCastle");
+ provider.addAlgorithm("Alg.Alias.KeyStore.spongycastle", "BouncyCastle");
}
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/PKCS12.java
index 73abd174..57f7855c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/PKCS12.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.keystore;
+package org.spongycastle.jcajce.provider.keystore;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
public class PKCS12
{
- private static final String PREFIX = "org.bouncycastle.jcajce.provider.keystore" + ".pkcs12.";
+ private static final String PREFIX = "org.spongycastle.jcajce.provider.keystore" + ".pkcs12.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java
index ea892610..a06ae391 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/bc/BcKeyStoreSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.keystore.bc;
+package org.spongycastle.jcajce.provider.keystore.bc;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -36,21 +36,21 @@ import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.io.DigestInputStream;
-import org.bouncycastle.crypto.io.DigestOutputStream;
-import org.bouncycastle.crypto.io.MacInputStream;
-import org.bouncycastle.crypto.io.MacOutputStream;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jce.interfaces.BCKeyStore;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.io.TeeOutputStream;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.generators.PKCS12ParametersGenerator;
+import org.spongycastle.crypto.io.DigestInputStream;
+import org.spongycastle.crypto.io.DigestOutputStream;
+import org.spongycastle.crypto.io.MacInputStream;
+import org.spongycastle.crypto.io.MacOutputStream;
+import org.spongycastle.crypto.macs.HMac;
+import org.spongycastle.jce.interfaces.BCKeyStore;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.io.Streams;
+import org.spongycastle.util.io.TeeOutputStream;
public class BcKeyStoreSpi
extends KeyStoreSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
index 69a7206d..c8891aa7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.keystore.pkcs12;
+package org.spongycastle.jcajce.provider.keystore.pkcs12;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -44,60 +44,60 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.BEROutputStream;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.CertBag;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.EncryptedData;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.jcajce.provider.config.PKCS12StoreParameter;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
-import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
-import org.bouncycastle.jce.interfaces.BCKeyStore;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.JDKPKCS12StoreParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.BEROctetString;
+import org.spongycastle.asn1.BEROutputStream;
+import org.spongycastle.asn1.DERBMPString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.GOST28147Parameters;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.ntt.NTTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.AuthenticatedSafe;
+import org.spongycastle.asn1.pkcs.CertBag;
+import org.spongycastle.asn1.pkcs.ContentInfo;
+import org.spongycastle.asn1.pkcs.EncryptedData;
+import org.spongycastle.asn1.pkcs.MacData;
+import org.spongycastle.asn1.pkcs.PBES2Parameters;
+import org.spongycastle.asn1.pkcs.PBKDF2Params;
+import org.spongycastle.asn1.pkcs.PKCS12PBEParams;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.Pfx;
+import org.spongycastle.asn1.pkcs.SafeBag;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.spongycastle.asn1.x509.DigestInfo;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.SubjectKeyIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.jcajce.provider.config.PKCS12StoreParameter;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.jcajce.spec.GOST28147ParameterSpec;
+import org.spongycastle.jcajce.spec.PBKDF2KeySpec;
+import org.spongycastle.jce.interfaces.BCKeyStore;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.jce.provider.JDKPKCS12StoreParameter;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.Strings;
+import org.spongycastle.util.encoders.Hex;
public class PKCS12KeyStoreSpi
extends KeyStoreSpi
@@ -861,7 +861,7 @@ public class PKCS12KeyStoreSpi
SafeBag b = SafeBag.getInstance(seq.getObjectAt(j));
if (b.getBagId().equals(pkcs8ShroudedKeyBag))
{
- org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo eIn = org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo.getInstance(b.getBagValue());
+ org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo eIn = org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo.getInstance(b.getBagValue());
PrivateKey privKey = unwrapKey(eIn.getEncryptionAlgorithm(), eIn.getEncryptedData(), password, wrongPKCS12Zero);
//
@@ -960,7 +960,7 @@ public class PKCS12KeyStoreSpi
}
else if (b.getBagId().equals(pkcs8ShroudedKeyBag))
{
- org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo eIn = org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo.getInstance(b.getBagValue());
+ org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo eIn = org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo.getInstance(b.getBagValue());
PrivateKey privKey = unwrapKey(eIn.getEncryptionAlgorithm(), eIn.getEncryptedData(), password, wrongPKCS12Zero);
//
@@ -1022,7 +1022,7 @@ public class PKCS12KeyStoreSpi
}
else if (b.getBagId().equals(keyBag))
{
- org.bouncycastle.asn1.pkcs.PrivateKeyInfo kInfo = org.bouncycastle.asn1.pkcs.PrivateKeyInfo.getInstance(b.getBagValue());
+ org.spongycastle.asn1.pkcs.PrivateKeyInfo kInfo = org.spongycastle.asn1.pkcs.PrivateKeyInfo.getInstance(b.getBagValue());
PrivateKey privKey = BouncyCastleProvider.getPrivateKey(kInfo);
//
@@ -1286,7 +1286,7 @@ public class PKCS12KeyStoreSpi
PKCS12PBEParams kParams = new PKCS12PBEParams(kSalt, MIN_ITERATIONS);
byte[] kBytes = wrapKey(keyAlgorithm.getId(), privKey, kParams, password);
AlgorithmIdentifier kAlgId = new AlgorithmIdentifier(keyAlgorithm, kParams.toASN1Primitive());
- org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo kInfo = new org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo(kAlgId, kBytes);
+ org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo kInfo = new org.spongycastle.asn1.pkcs.EncryptedPrivateKeyInfo(kAlgId, kBytes);
boolean attrSet = false;
ASN1EncodableVector kName = new ASN1EncodableVector();
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/AES.java
index 244342b1..2ad0d2d4 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/AES.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.lang.reflect.Constructor;
@@ -11,35 +11,35 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.asn1.cms.GCMParameters;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.engines.RFC5649WrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.asn1.bc.BCObjectIdentifiers;
+import org.spongycastle.asn1.cms.GCMParameters;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.AESFastEngine;
+import org.spongycastle.crypto.engines.AESWrapEngine;
+import org.spongycastle.crypto.engines.RFC3211WrapEngine;
+import org.spongycastle.crypto.engines.RFC5649WrapEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Integers;
public final class AES
{
@@ -123,7 +123,7 @@ public final class AES
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new AESFastEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new AESFastEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ARC4.java
index e31ab296..b50711b1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ARC4.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.RC4Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class ARC4
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Blowfish.java
index 76949344..152d29b1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Blowfish.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.BlowfishEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Blowfish
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST5.java
index f360a41f..9de0707e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST5.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -9,18 +9,18 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.misc.CAST5CBCParameters;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.CAST5Engine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class CAST5
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST6.java
index d16e6c76..be5f62b3 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/CAST6.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.CAST6Engine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
public final class CAST6
{
@@ -56,7 +56,7 @@ public final class CAST6
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new CAST6Engine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new CAST6Engine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Camellia.java
index 95b51567..6724d2af 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Camellia.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,25 +7,25 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.engines.CamelliaWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ntt.NTTObjectIdentifiers;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.CamelliaEngine;
+import org.spongycastle.crypto.engines.CamelliaWrapEngine;
+import org.spongycastle.crypto.engines.RFC3211WrapEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class Camellia
{
@@ -89,7 +89,7 @@ public final class Camellia
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new CamelliaEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new CamelliaEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ChaCha.java
index ff748ae4..406a3f0c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/ChaCha.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.ChaChaEngine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class ChaCha
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DES.java
index f3411950..d35cd046 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DES.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -13,34 +13,34 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.generators.DESKeyGenerator;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.ISO9797Alg3Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.RFC3211WrapEngine;
+import org.spongycastle.crypto.generators.DESKeyGenerator;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.macs.ISO9797Alg3Mac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.paddings.ISO7816d4Padding;
+import org.spongycastle.crypto.params.DESParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.PBE;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class DES
{
@@ -427,7 +427,7 @@ public final class DES
extends AlgorithmProvider
{
private static final String PREFIX = DES.class.getName();
- private static final String PACKAGE = "org.bouncycastle.jcajce.provider.symmetric"; // JDK 1.2
+ private static final String PACKAGE = "org.spongycastle.jcajce.provider.symmetric"; // JDK 1.2
public Mappings()
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DESede.java
index 0f53e504..3c7cbb86 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/DESede.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -12,26 +12,26 @@ import javax.crypto.spec.DESedeKeySpec;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.DESedeWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.DESedeWrapEngine;
+import org.spongycastle.crypto.engines.RFC3211WrapEngine;
+import org.spongycastle.crypto.generators.DESedeKeyGenerator;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.macs.CMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.paddings.ISO7816d4Padding;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class DESede
{
@@ -352,7 +352,7 @@ public final class DESede
extends AlgorithmProvider
{
private static final String PREFIX = DESede.class.getName();
- private static final String PACKAGE = "org.bouncycastle.jcajce.provider.symmetric"; // JDK 1.2
+ private static final String PACKAGE = "org.spongycastle.jcajce.provider.symmetric"; // JDK 1.2
public Mappings()
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/GOST28147.java
index fcaea941..c12ba7cd 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/GOST28147.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,21 +7,21 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.macs.GOST28147Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCFBBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.GOST28147Engine;
+import org.spongycastle.crypto.macs.GOST28147Mac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.GCFBBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class GOST28147
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grain128.java
index d7232b11..39f70a36 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grain128.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.Grain128Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Grain128
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grainv1.java
index fce224d2..d5aaf604 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Grainv1.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.Grainv1Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Grainv1
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC128.java
index efe7ede1..1463a597 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC128.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.HC128Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class HC128
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC256.java
index dd93445b..126fec27 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/HC256.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.HC256Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class HC256
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/IDEA.java
index 4248eb8d..0650a9b4 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/IDEA.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -9,23 +9,23 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.IDEAEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.misc.IDEACBCPar;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.IDEAEngine;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class IDEA
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Noekeon.java
index a92f21dd..4342b102 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Noekeon.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,20 +7,20 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.NoekeonEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class Noekeon
{
@@ -66,7 +66,7 @@ public final class Noekeon
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new NoekeonEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new NoekeonEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPBKDF2.java
index 4b0d8b97..fb3e873d 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPBKDF2.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -10,20 +10,20 @@ import javax.crypto.SecretKey;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PBKDF2Params;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
+import org.spongycastle.jcajce.provider.symmetric.util.PBE;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jcajce.spec.PBKDF2KeySpec;
public class PBEPBKDF2
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPKCS12.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPKCS12.java
index 9be3c997..e9a918e8 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPKCS12.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/PBEPKCS12.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -6,12 +6,12 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.pkcs.PKCS12PBEParams;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public class PBEPKCS12
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC2.java
index 4160999f..4a72b245 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC2.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -10,26 +10,26 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.RC2ParameterSpec;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.engines.RC2WrapEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RC2CBCParameter;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.RC2Engine;
+import org.spongycastle.crypto.engines.RC2WrapEngine;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Arrays;
public final class RC2
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC5.java
index aa63a951..53a7a291 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC5.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,20 +7,20 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC532Engine;
-import org.bouncycastle.crypto.engines.RC564Engine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.RC532Engine;
+import org.spongycastle.crypto.engines.RC564Engine;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class RC5
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC6.java
index 114c40b6..232958f5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/RC6.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,24 +7,24 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.BufferedBlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.RC6Engine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class RC6
{
@@ -88,7 +88,7 @@ public final class RC6
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new RC6Engine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new RC6Engine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Rijndael.java
index b8c36b7b..e39df5d5 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Rijndael.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RijndaelEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.RijndaelEngine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Rijndael
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SEED.java
index e7e257c3..494f039e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SEED.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,24 +7,24 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.SEEDWrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.kisa.KISAObjectIdentifiers;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.SEEDEngine;
+import org.spongycastle.crypto.engines.SEEDWrapEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class SEED
{
@@ -88,7 +88,7 @@ public final class SEED
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new SEEDEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new SEEDEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Salsa20.java
index 88b27a6d..6540a0b6 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Salsa20.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.Salsa20Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Salsa20
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Serpent.java
index ec21880c..6f2660ad 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Serpent.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.SerpentEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
public final class Serpent
{
@@ -58,7 +58,7 @@ public final class Serpent
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new TwofishEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new TwofishEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Shacal2.java
index 81666af7..942544e4 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Shacal2.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -7,17 +7,17 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Shacal2Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.Shacal2Engine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public final class Shacal2
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SipHash.java
index 5a115318..b568046a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SipHash.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class SipHash
{
@@ -17,7 +17,7 @@ public final class SipHash
{
public Mac24()
{
- super(new org.bouncycastle.crypto.macs.SipHash());
+ super(new org.spongycastle.crypto.macs.SipHash());
}
}
@@ -26,7 +26,7 @@ public final class SipHash
{
public Mac48()
{
- super(new org.bouncycastle.crypto.macs.SipHash(4, 8));
+ super(new org.spongycastle.crypto.macs.SipHash(4, 8));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Skipjack.java
index ec75944c..1f79c547 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Skipjack.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.SkipjackEngine;
+import org.spongycastle.crypto.macs.CBCBlockCipherMac;
+import org.spongycastle.crypto.macs.CFBBlockCipherMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Skipjack
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
index c1b3d199..16a4cd23 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
abstract class SymmetricAlgorithmProvider
extends AlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/TEA.java
index 4bc12c9f..4e1874ff 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/TEA.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.TEAEngine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class TEA
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Threefish.java
index 2970de6a..49e4d1b1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Threefish.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class Threefish
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Twofish.java
index 4c3ab1c7..ec357fe4 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/Twofish.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.generators.Poly1305KeyGenerator;
+import org.spongycastle.crypto.macs.GMac;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
public final class Twofish
{
@@ -59,7 +59,7 @@ public final class Twofish
{
public Poly1305()
{
- super(new org.bouncycastle.crypto.macs.Poly1305(new TwofishEngine()));
+ super(new org.spongycastle.crypto.macs.Poly1305(new TwofishEngine()));
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPC.java
index 1e59e078..c907d0f0 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPC.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.symmetric;
+package org.spongycastle.jcajce.provider.symmetric;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.VMPCEngine;
-import org.bouncycastle.crypto.macs.VMPCMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.VMPCEngine;
+import org.spongycastle.crypto.macs.VMPCMac;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseMac;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class VMPC
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPCKSA3.java
index b5d8814a..0132feed 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/VMPCKSA3.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.VMPCKSA3Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.VMPCKSA3Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class VMPCKSA3
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XSalsa20.java
index 5be06401..a9912057 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XSalsa20.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.XSalsa20Engine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class XSalsa20
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XTEA.java
index 2e946de1..55b2b35a 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/XTEA.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
+package org.spongycastle.jcajce.provider.symmetric;
+
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.engines.XTEAEngine;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
+import org.spongycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+import org.spongycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
public final class XTEA
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BCPBEKey.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BCPBEKey.java
index a4719729..e8eac7e1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BCPBEKey.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BCPBEKey.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import javax.crypto.interfaces.PBEKey;
import javax.crypto.spec.PBEKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
public class BCPBEKey
implements PBEKey
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java
index 63d6548e..532c88ce 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameterGenerator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.AlgorithmParameterGeneratorSpi;
import java.security.SecureRandom;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java
index ec723db6..2bba41f1 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseAlgorithmParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.AlgorithmParametersSpi;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
index 01fe466d..8d7bb13c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -23,45 +23,45 @@ import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
-import org.bouncycastle.asn1.cms.GCMParameters;
-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.OutputLengthException;
-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.GCFBBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
-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.paddings.BlockCipherPadding;
-import org.bouncycastle.crypto.paddings.ISO10126d2Padding;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-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.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
-import org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.cms.GCMParameters;
+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.OutputLengthException;
+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.GCFBBlockCipher;
+import org.spongycastle.crypto.modes.GCMBlockCipher;
+import org.spongycastle.crypto.modes.GOFBBlockCipher;
+import org.spongycastle.crypto.modes.OCBBlockCipher;
+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.paddings.BlockCipherPadding;
+import org.spongycastle.crypto.paddings.ISO10126d2Padding;
+import org.spongycastle.crypto.paddings.ISO7816d4Padding;
+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.AEADParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.params.ParametersWithSBox;
+import org.spongycastle.crypto.params.RC2Parameters;
+import org.spongycastle.crypto.params.RC5Parameters;
+import org.spongycastle.jcajce.spec.GOST28147ParameterSpec;
+import org.spongycastle.jcajce.spec.RepeatedSecretKeySpec;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Strings;
public class BaseBlockCipher
extends BaseWrapCipher
@@ -137,7 +137,7 @@ public class BaseBlockCipher
}
protected BaseBlockCipher(
- org.bouncycastle.crypto.BlockCipher engine,
+ org.spongycastle.crypto.BlockCipher engine,
int ivLength)
{
baseEngine = engine;
@@ -883,7 +883,7 @@ public class BaseBlockCipher
public String getAlgorithmName();
- public org.bouncycastle.crypto.BlockCipher getUnderlyingCipher();
+ public org.spongycastle.crypto.BlockCipher getUnderlyingCipher();
public int getOutputSize(int len);
@@ -912,12 +912,12 @@ public class BaseBlockCipher
this.cipher = cipher;
}
- BufferedGenericBlockCipher(org.bouncycastle.crypto.BlockCipher cipher)
+ BufferedGenericBlockCipher(org.spongycastle.crypto.BlockCipher cipher)
{
this.cipher = new PaddedBufferedBlockCipher(cipher);
}
- BufferedGenericBlockCipher(org.bouncycastle.crypto.BlockCipher cipher, BlockCipherPadding padding)
+ BufferedGenericBlockCipher(org.spongycastle.crypto.BlockCipher cipher, BlockCipherPadding padding)
{
this.cipher = new PaddedBufferedBlockCipher(cipher, padding);
}
@@ -938,7 +938,7 @@ public class BaseBlockCipher
return cipher.getUnderlyingCipher().getAlgorithmName();
}
- public org.bouncycastle.crypto.BlockCipher getUnderlyingCipher()
+ public org.spongycastle.crypto.BlockCipher getUnderlyingCipher()
{
return cipher.getUnderlyingCipher();
}
@@ -1033,7 +1033,7 @@ public class BaseBlockCipher
return false;
}
- public org.bouncycastle.crypto.BlockCipher getUnderlyingCipher()
+ public org.spongycastle.crypto.BlockCipher getUnderlyingCipher()
{
return cipher.getUnderlyingCipher();
}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java
index 12d2b851..460d14a9 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseKeyGenerator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidParameterException;
@@ -9,8 +9,8 @@ import javax.crypto.KeyGeneratorSpi;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
+import org.spongycastle.crypto.CipherKeyGenerator;
+import org.spongycastle.crypto.KeyGenerationParameters;
public class BaseKeyGenerator
extends KeyGeneratorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseMac.java
index 270d6486..a711dae7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseMac.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -12,12 +12,12 @@ import javax.crypto.MacSpi;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.SkeinParameters;
-import org.bouncycastle.jcajce.spec.SkeinParameterSpec;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.SkeinParameters;
+import org.spongycastle.jcajce.spec.SkeinParameterSpec;
public class BaseMac
extends MacSpi implements PBE
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java
index 31896cd2..1ce00a3c 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseSecretKeyFactory.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.lang.reflect.Constructor;
import java.security.InvalidKeyException;
@@ -9,7 +9,7 @@ import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactorySpi;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
public class BaseSecretKeyFactory
extends SecretKeyFactorySpi
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
index f376aa2c..e362f383 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -17,12 +17,12 @@ import javax.crypto.spec.PBEParameterSpec;
import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public class BaseStreamCipher
extends BaseWrapCipher
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
index 42ab6217..ce1909c0 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -26,14 +26,14 @@ import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.Wrapper;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
public abstract class BaseWrapCipher
extends CipherSpi
diff --git a/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java
new file mode 100644
index 00000000..b4a55c10
--- /dev/null
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/BlockCipherProvider.java
@@ -0,0 +1,8 @@
+package org.spongycastle.jcajce.provider.symmetric.util;
+
+import org.spongycastle.crypto.BlockCipher;
+
+public interface BlockCipherProvider
+{
+ BlockCipher get();
+}
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java
index b5a95526..1c1ae189 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/IvAlgorithmParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.io.IOException;
import java.security.spec.AlgorithmParameterSpec;
@@ -6,10 +6,10 @@ import java.security.spec.InvalidParameterSpecException;
import javax.crypto.spec.IvParameterSpec;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.util.Arrays;
public class IvAlgorithmParameters
extends BaseAlgorithmParameters
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBE.java
index fac3ead0..a0a4721e 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBE.java
@@ -1,26 +1,26 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.TigerDigest;
-import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.digests.GOST3411Digest;
+import org.spongycastle.crypto.digests.MD2Digest;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.crypto.digests.TigerDigest;
+import org.spongycastle.crypto.generators.OpenSSLPBEParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS12ParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS5S1ParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator;
+import org.spongycastle.crypto.params.DESParameters;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
public interface PBE
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java
index 434f6bb8..0e4db8ec 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/symmetric/util/PBESecretKeyFactory.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.provider.symmetric.util;
+package org.spongycastle.jcajce.provider.symmetric.util;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
@@ -6,8 +6,8 @@ import java.security.spec.KeySpec;
import javax.crypto.SecretKey;
import javax.crypto.spec.PBEKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.crypto.CipherParameters;
public class PBESecretKeyFactory
extends BaseSecretKeyFactory
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AlgorithmProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AlgorithmProvider.java
index 50fe939c..678dc34f 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AlgorithmProvider.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AlgorithmProvider.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jcajce.provider.util;
+package org.spongycastle.jcajce.provider.util;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
public abstract class AlgorithmProvider
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java
index c4010844..77218f47 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricAlgorithmProvider.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jcajce.provider.util;
+package org.spongycastle.jcajce.provider.util;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
public abstract class AsymmetricAlgorithmProvider
extends AlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java
index e2f4e4ae..8181dea7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/util/AsymmetricKeyInfoConverter.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jcajce.provider.util;
+package org.spongycastle.jcajce.provider.util;
import java.io.IOException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
public interface AsymmetricKeyInfoConverter
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java b/prov/src/main/java/org/spongycastle/jcajce/provider/util/DigestFactory.java
index f97e75f2..ab090ac8 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/util/DigestFactory.java
@@ -1,22 +1,22 @@
-package org.bouncycastle.jcajce.provider.util;
+package org.spongycastle.jcajce.provider.util;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-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.util.Strings;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.MD5Digest;
+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.util.Strings;
public class DigestFactory
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/SecretKeyUtil.java b/prov/src/main/java/org/spongycastle/jcajce/provider/util/SecretKeyUtil.java
index 56d6c5b3..7d763a21 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/provider/util/SecretKeyUtil.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/provider/util/SecretKeyUtil.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.provider.util;
+package org.spongycastle.jcajce.provider.util;
import java.util.HashMap;
import java.util.Map;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.ntt.NTTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.util.Integers;
public class SecretKeyUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java b/prov/src/main/java/org/spongycastle/jcajce/spec/GOST28147ParameterSpec.java
index be341c47..2108d6f2 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/spec/GOST28147ParameterSpec.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jcajce.spec;
+package org.spongycastle.jcajce.spec;
import java.security.spec.AlgorithmParameterSpec;
import java.util.HashMap;
import java.util.Map;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.crypto.engines.GOST28147Engine;
+import org.spongycastle.util.Arrays;
/**
* A parameter spec for the GOST-28147 cipher.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/spec/PBKDF2KeySpec.java b/prov/src/main/java/org/spongycastle/jcajce/spec/PBKDF2KeySpec.java
index 09a9bd0b..7bfe09af 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/spec/PBKDF2KeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/spec/PBKDF2KeySpec.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jcajce.spec;
+package org.spongycastle.jcajce.spec;
import javax.crypto.spec.PBEKeySpec;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
/**
* Extension of PBEKeySpec which takes into account the PRF algorithm setting available in PKCS#5 PBKDF2.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java b/prov/src/main/java/org/spongycastle/jcajce/spec/RepeatedSecretKeySpec.java
index 6af15db1..b3a0e2f7 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/spec/RepeatedSecretKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.spec;
+package org.spongycastle.jcajce.spec;
import javax.crypto.SecretKey;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java b/prov/src/main/java/org/spongycastle/jcajce/spec/SkeinParameterSpec.java
index 084f0e88..e92fde23 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/spec/SkeinParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.spec;
+package org.spongycastle.jcajce.spec;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -13,28 +13,28 @@ import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Integers;
/**
* Parameters for the Skein hash function - a series of byte[] strings identified by integer tags.
* <p/>
* Parameterised Skein can be used for:
* <ul>
- * <li>MAC generation, by providing a {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setKey(byte[]) key}.</li>
- * <li>Randomised hashing, by providing a {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setNonce(byte[]) nonce}.</li>
+ * <li>MAC generation, by providing a {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setKey(byte[]) key}.</li>
+ * <li>Randomised hashing, by providing a {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setNonce(byte[]) nonce}.</li>
* <li>A hash function for digital signatures, associating a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPublicKey(byte[]) public key} with the message digest.</li>
+ * {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setPublicKey(byte[]) public key} with the message digest.</li>
* <li>A key derivation function, by providing a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setKeyIdentifier(byte[]) key identifier}.</li>
+ * {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setKeyIdentifier(byte[]) key identifier}.</li>
* <li>Personalised hashing, by providing a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(java.util.Date, String, String) recommended format} or
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(byte[]) arbitrary} personalisation string.</li>
+ * {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(java.util.Date, String, String) recommended format} or
+ * {@link org.spongycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(byte[]) arbitrary} personalisation string.</li>
* </ul>
*
- * @see org.bouncycastle.crypto.digests.SkeinEngine
- * @see org.bouncycastle.crypto.digests.SkeinDigest
- * @see org.bouncycastle.crypto.macs.SkeinMac
+ * @see org.spongycastle.crypto.digests.SkeinEngine
+ * @see org.spongycastle.crypto.digests.SkeinDigest
+ * @see org.spongycastle.crypto.macs.SkeinMac
*/
public class SkeinParameterSpec
implements AlgorithmParameterSpec
@@ -146,7 +146,7 @@ public class SkeinParameterSpec
}
/**
- * A builder for {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec}.
+ * A builder for {@link org.spongycastle.jcajce.spec.SkeinParameterSpec}.
*/
public static class Builder
{
@@ -169,10 +169,10 @@ public class SkeinParameterSpec
/**
* Sets a parameters to apply to the Skein hash function.<br>
* Parameter types must be in the range 0,5..62, and cannot use the value {@value
- * org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} (reserved for message body).
+ * org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} (reserved for message body).
* <p/>
- * Parameters with type < {@value org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} are processed before
- * the message content, parameters with type > {@value org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE}
+ * Parameters with type < {@value org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} are processed before
+ * the message content, parameters with type > {@value org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE}
* are processed after the message and prior to output.
*
* @param type the type of the parameter, in the range 5..62.
@@ -200,7 +200,7 @@ public class SkeinParameterSpec
}
/**
- * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY} parameter.
+ * Sets the {@link org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY} parameter.
*/
public Builder setKey(byte[] key)
{
@@ -208,7 +208,7 @@ public class SkeinParameterSpec
}
/**
- * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_PERSONALISATION} parameter.
+ * Sets the {@link org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_PERSONALISATION} parameter.
*/
public Builder setPersonalisation(byte[] personalisation)
{
@@ -284,7 +284,7 @@ public class SkeinParameterSpec
}
/**
- * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
+ * Sets the {@link org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
*/
public Builder setPublicKey(byte[] publicKey)
{
@@ -292,7 +292,7 @@ public class SkeinParameterSpec
}
/**
- * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
+ * Sets the {@link org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
*/
public Builder setKeyIdentifier(byte[] keyIdentifier)
{
@@ -300,7 +300,7 @@ public class SkeinParameterSpec
}
/**
- * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_NONCE} parameter.
+ * Sets the {@link org.spongycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_NONCE} parameter.
*/
public Builder setNonce(byte[] nonce)
{
@@ -308,7 +308,7 @@ public class SkeinParameterSpec
}
/**
- * Constructs a new {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec} instance with the parameters provided to this
+ * Constructs a new {@link org.spongycastle.jcajce.spec.SkeinParameterSpec} instance with the parameters provided to this
* builder.
*/
public SkeinParameterSpec build()
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java b/prov/src/main/java/org/spongycastle/jcajce/util/DefaultJcaJceHelper.java
index 43a97f30..0a805fdc 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/util/DefaultJcaJceHelper.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.util;
+package org.spongycastle.jcajce.util;
import java.security.AlgorithmParameterGenerator;
import java.security.AlgorithmParameters;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceHelper.java b/prov/src/main/java/org/spongycastle/jcajce/util/JcaJceHelper.java
index f5da3354..f15cdefe 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceHelper.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/util/JcaJceHelper.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.util;
+package org.spongycastle.jcajce.util;
import java.security.AlgorithmParameterGenerator;
import java.security.AlgorithmParameters;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java b/prov/src/main/java/org/spongycastle/jcajce/util/JcaJceUtils.java
index 9f62ced8..b1bf5fec 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/util/JcaJceUtils.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.jcajce.util;
+package org.spongycastle.jcajce.util;
import java.io.IOException;
import java.security.AlgorithmParameters;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
/**
* General JCA/JCE utility methods.
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/util/NamedJcaJceHelper.java b/prov/src/main/java/org/spongycastle/jcajce/util/NamedJcaJceHelper.java
index ebbfacc1..fde27316 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/util/NamedJcaJceHelper.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/util/NamedJcaJceHelper.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.util;
+package org.spongycastle.jcajce.util;
import java.security.AlgorithmParameterGenerator;
import java.security.AlgorithmParameters;
diff --git a/prov/src/main/java/org/bouncycastle/jcajce/util/ProviderJcaJceHelper.java b/prov/src/main/java/org/spongycastle/jcajce/util/ProviderJcaJceHelper.java
index fad10481..2a85a737 100644
--- a/prov/src/main/java/org/bouncycastle/jcajce/util/ProviderJcaJceHelper.java
+++ b/prov/src/main/java/org/spongycastle/jcajce/util/ProviderJcaJceHelper.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jcajce.util;
+package org.spongycastle.jcajce.util;
import java.security.AlgorithmParameterGenerator;
import java.security.AlgorithmParameters;
diff --git a/prov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java b/prov/src/main/java/org/spongycastle/jce/ECGOST3410NamedCurveTable.java
index 7843e0a5..49c525ad 100644
--- a/prov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java
+++ b/prov/src/main/java/org/spongycastle/jce/ECGOST3410NamedCurveTable.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
/**
* a table of locally supported named curves.
diff --git a/prov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java b/prov/src/main/java/org/spongycastle/jce/ECKeyUtil.java
index c4c72cf4..8b4b3891 100644
--- a/prov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/ECKeyUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.io.UnsupportedEncodingException;
import java.security.KeyFactory;
@@ -11,17 +11,17 @@ import java.security.Security;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
/**
* Utility class to allow conversion of EC key parameters to explicit from named
diff --git a/prov/src/main/java/org/bouncycastle/jce/ECNamedCurveTable.java b/prov/src/main/java/org/spongycastle/jce/ECNamedCurveTable.java
index 5ad207ac..e3ebccff 100644
--- a/prov/src/main/java/org/bouncycastle/jce/ECNamedCurveTable.java
+++ b/prov/src/main/java/org/spongycastle/jce/ECNamedCurveTable.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
/**
* a table of locally supported named curves.
@@ -21,12 +21,12 @@ public class ECNamedCurveTable
public static ECNamedCurveParameterSpec getParameterSpec(
String name)
{
- X9ECParameters ecP = org.bouncycastle.crypto.ec.CustomNamedCurves.getByName(name);
+ X9ECParameters ecP = org.spongycastle.crypto.ec.CustomNamedCurves.getByName(name);
if (ecP == null)
{
try
{
- ecP = org.bouncycastle.crypto.ec.CustomNamedCurves.getByOID(new ASN1ObjectIdentifier(name));
+ ecP = org.spongycastle.crypto.ec.CustomNamedCurves.getByOID(new ASN1ObjectIdentifier(name));
}
catch (IllegalArgumentException e)
{
@@ -35,12 +35,12 @@ public class ECNamedCurveTable
if (ecP == null)
{
- ecP = org.bouncycastle.asn1.x9.ECNamedCurveTable.getByName(name);
+ ecP = org.spongycastle.asn1.x9.ECNamedCurveTable.getByName(name);
if (ecP == null)
{
try
{
- ecP = org.bouncycastle.asn1.x9.ECNamedCurveTable.getByOID(new ASN1ObjectIdentifier(name));
+ ecP = org.spongycastle.asn1.x9.ECNamedCurveTable.getByOID(new ASN1ObjectIdentifier(name));
}
catch (IllegalArgumentException e)
{
@@ -71,6 +71,6 @@ public class ECNamedCurveTable
*/
public static Enumeration getNames()
{
- return org.bouncycastle.asn1.x9.ECNamedCurveTable.getNames();
+ return org.spongycastle.asn1.x9.ECNamedCurveTable.getNames();
}
}
diff --git a/prov/src/main/java/org/bouncycastle/jce/ECPointUtil.java b/prov/src/main/java/org/spongycastle/jce/ECPointUtil.java
index 5ff966a2..fa9fa62f 100644
--- a/prov/src/main/java/org/bouncycastle/jce/ECPointUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/ECPointUtil.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.security.spec.ECFieldF2m;
import java.security.spec.ECFieldFp;
import java.security.spec.ECPoint;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECCurve;
/**
* Utility class for handling EC point decoding.
@@ -49,7 +49,7 @@ public class ECPointUtil
}
}
- org.bouncycastle.math.ec.ECPoint p = c.decodePoint(encoded);
+ org.spongycastle.math.ec.ECPoint p = c.decodePoint(encoded);
return new ECPoint(p.getAffineXCoord().toBigInteger(), p.getAffineYCoord().toBigInteger());
}
diff --git a/prov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java b/prov/src/main/java/org/spongycastle/jce/MultiCertStoreParameters.java
index 2ffa031a..8762494b 100644
--- a/prov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java
+++ b/prov/src/main/java/org/spongycastle/jce/MultiCertStoreParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.security.cert.CertStoreParameters;
import java.util.Collection;
diff --git a/prov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java b/prov/src/main/java/org/spongycastle/jce/PKCS10CertificationRequest.java
index 13bed1a9..dbc34a54 100644
--- a/prov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
+++ b/prov/src/main/java/org/spongycastle/jce/PKCS10CertificationRequest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -20,30 +20,30 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.CertificationRequest;
+import org.spongycastle.asn1.pkcs.CertificationRequestInfo;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
+import org.spongycastle.util.Strings;
/**
* A class for verifying and creating PKCS10 Certification requests.
@@ -68,7 +68,7 @@ import org.bouncycastle.util.Strings;
* values SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{\@type})
* }
* </pre>
- * @deprecated use classes in org.bouncycastle.pkcs.
+ * @deprecated use classes in org.spongycastle.pkcs.
*/
public class PKCS10CertificationRequest
extends CertificationRequest
diff --git a/prov/src/main/java/org/bouncycastle/jce/PKCS12Util.java b/prov/src/main/java/org/spongycastle/jce/PKCS12Util.java
index c7059b26..1cf7823a 100644
--- a/prov/src/main/java/org/bouncycastle/jce/PKCS12Util.java
+++ b/prov/src/main/java/org/spongycastle/jce/PKCS12Util.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -9,18 +9,18 @@ import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.pkcs.ContentInfo;
+import org.spongycastle.asn1.pkcs.MacData;
+import org.spongycastle.asn1.pkcs.Pfx;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DigestInfo;
/**
* Utility class for reencoding PKCS#12 files to definite length.
diff --git a/prov/src/main/java/org/bouncycastle/jce/PrincipalUtil.java b/prov/src/main/java/org/spongycastle/jce/PrincipalUtil.java
index 4bf65a03..3d6d6f4d 100644
--- a/prov/src/main/java/org/bouncycastle/jce/PrincipalUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/PrincipalUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.io.IOException;
import java.security.cert.CRLException;
@@ -6,10 +6,10 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.X509CRL;
import java.security.cert.X509Certificate;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.TBSCertificateStructure;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.asn1.x509.TBSCertificateStructure;
+import org.spongycastle.asn1.x509.X509Name;
/**
* a utility class that will extract X509Principal objects from X.509 certificates.
diff --git a/prov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java b/prov/src/main/java/org/spongycastle/jce/X509KeyUsage.java
index 163566a1..227670d6 100644
--- a/prov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
+++ b/prov/src/main/java/org/spongycastle/jce/X509KeyUsage.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.KeyUsage;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.KeyUsage;
/**
* A holding class for constructing an X509 Key Usage extension.
diff --git a/prov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java b/prov/src/main/java/org/spongycastle/jce/X509LDAPCertStoreParameters.java
index 80532fac..88259ec0 100644
--- a/prov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java
+++ b/prov/src/main/java/org/spongycastle/jce/X509LDAPCertStoreParameters.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
-import org.bouncycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreParameters;
import java.security.cert.CertStoreParameters;
import java.security.cert.LDAPCertStoreParameters;
diff --git a/prov/src/main/java/org/bouncycastle/jce/X509Principal.java b/prov/src/main/java/org/spongycastle/jce/X509Principal.java
index b1daa98e..dc3ef35c 100644
--- a/prov/src/main/java/org/bouncycastle/jce/X509Principal.java
+++ b/prov/src/main/java/org/spongycastle/jce/X509Principal.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.jce;
+package org.spongycastle.jce;
import java.io.IOException;
import java.security.Principal;
import java.util.Hashtable;
import java.util.Vector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.X509Name;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.X509Name;
/**
* a general extension of X509Name with a couple of extra methods and
@@ -18,7 +18,7 @@ import org.bouncycastle.asn1.x509.X509Name;
* Objects of this type can be created from certificates and CRLs using the
* PrincipalUtil class.
* </p>
- * @see org.bouncycastle.jce.PrincipalUtil
+ * @see org.spongycastle.jce.PrincipalUtil
* @deprecated use the X500Name class.
*/
public class X509Principal
diff --git a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathBuilderException.java b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathBuilderException.java
index a0b2d900..65c0e4c4 100644
--- a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathBuilderException.java
+++ b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathBuilderException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.exception;
+package org.spongycastle.jce.exception;
import java.security.cert.CertPath;
import java.security.cert.CertPathBuilderException;
diff --git a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathValidatorException.java b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathValidatorException.java
index e36848f4..da9003aa 100644
--- a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertPathValidatorException.java
+++ b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertPathValidatorException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.exception;
+package org.spongycastle.jce.exception;
import java.security.cert.CertPath;
import java.security.cert.CertPathValidatorException;
diff --git a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertificateEncodingException.java
index e3c33d80..210e49e4 100644
--- a/prov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java
+++ b/prov/src/main/java/org/spongycastle/jce/exception/ExtCertificateEncodingException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.exception;
+package org.spongycastle.jce.exception;
import java.security.cert.CertificateEncodingException;
diff --git a/prov/src/main/java/org/bouncycastle/jce/exception/ExtException.java b/prov/src/main/java/org/spongycastle/jce/exception/ExtException.java
index 52c60ded..ea538d13 100644
--- a/prov/src/main/java/org/bouncycastle/jce/exception/ExtException.java
+++ b/prov/src/main/java/org/spongycastle/jce/exception/ExtException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.exception;
+package org.spongycastle.jce.exception;
/**
*
diff --git a/prov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java b/prov/src/main/java/org/spongycastle/jce/exception/ExtIOException.java
index 656e23ae..38bea138 100644
--- a/prov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java
+++ b/prov/src/main/java/org/spongycastle/jce/exception/ExtIOException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.exception;
+package org.spongycastle.jce.exception;
import java.io.IOException;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java b/prov/src/main/java/org/spongycastle/jce/interfaces/BCKeyStore.java
index a36abbb2..1b6eede3 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/BCKeyStore.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.SecureRandom;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ECKey.java
index 0812c128..b463c11d 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ECKey.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
-import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jce.spec.ECParameterSpec;
/**
* generic interface for an Elliptic Curve Key.
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPointEncoder.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPointEncoder.java
index 001dab3e..4123d657 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPointEncoder.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPointEncoder.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
/**
* All BC elliptic curve keys implement this interface. You need to
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPrivateKey.java
index 39d80c3c..23566434 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.math.BigInteger;
import java.security.PrivateKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPublicKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPublicKey.java
index db2ecdce..1f435825 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ECPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ECPublicKey.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.PublicKey;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.math.ec.ECPoint;
/**
* interface for elliptic curve public keys.
diff --git a/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalKey.java
new file mode 100644
index 00000000..eb315499
--- /dev/null
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalKey.java
@@ -0,0 +1,8 @@
+package org.spongycastle.jce.interfaces;
+
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
+
+public interface ElGamalKey
+{
+ public ElGamalParameterSpec getParameters();
+}
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPrivateKey.java
index 609a2a84..28d2f967 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.math.BigInteger;
import java.security.PrivateKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPublicKey.java
index c9fe35e6..e5ec01c2 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/ElGamalPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.math.BigInteger;
import java.security.PublicKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Key.java
index ad16ac3b..f1a03f9f 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Key.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
/**
* Main interface for a GOST 3410-94 key.
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Params.java
index 175913b0..5707a159 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410Params.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
+import org.spongycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
public interface GOST3410Params
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PrivateKey.java
index dcb25fe7..867a0fee 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PublicKey.java
index 447cec2b..49d5efd1 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/GOST3410PublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.PublicKey;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/IESKey.java
index f1d79013..91aebd6c 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/IESKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.Key;
import java.security.PrivateKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/MQVPrivateKey.java
index a8caffd5..28363386 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/MQVPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.PrivateKey;
import java.security.PublicKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java b/prov/src/main/java/org/spongycastle/jce/interfaces/MQVPublicKey.java
index 1be14bd0..a0ff3a32 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/MQVPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.security.PublicKey;
diff --git a/prov/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java b/prov/src/main/java/org/spongycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
index b8ebee74..fe3a0cb6 100644
--- a/prov/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
+++ b/prov/src/main/java/org/spongycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.jce.interfaces;
+package org.spongycastle.jce.interfaces;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
/**
* allow us to set attributes on objects that can go into a PKCS12 store.
diff --git a/prov/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java b/prov/src/main/java/org/spongycastle/jce/netscape/NetscapeCertRequest.java
index 39dd35ad..145cfcb4 100644
--- a/prov/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java
+++ b/prov/src/main/java/org/spongycastle/jce/netscape/NetscapeCertRequest.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.netscape;
+package org.spongycastle.jce.netscape;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -15,17 +15,17 @@ import java.security.SignatureException;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
/**
*
@@ -117,7 +117,7 @@ public class NetscapeCertRequest
pubkeyinfo).getBytes());
keyAlg = pubkeyinfo.getAlgorithmId();
- pubkey = KeyFactory.getInstance(keyAlg.getObjectId().getId(), "BC")
+ pubkey = KeyFactory.getInstance(keyAlg.getObjectId().getId(), "SC")
.generatePublic(xspec);
}
@@ -206,7 +206,7 @@ public class NetscapeCertRequest
// by someone who knew the associated private key
//
Signature sig = Signature.getInstance(sigAlg.getObjectId().getId(),
- "BC");
+ "SC");
sig.initVerify(pubkey);
sig.update(content.getBytes());
@@ -226,7 +226,7 @@ public class NetscapeCertRequest
InvalidKeySpecException
{
Signature sig = Signature.getInstance(sigAlg.getAlgorithm().getId(),
- "BC");
+ "SC");
if (rand != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java b/prov/src/main/java/org/spongycastle/jce/provider/AnnotatedException.java
index c9ac46ef..733a2a90 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/AnnotatedException.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
-import org.bouncycastle.jce.exception.ExtException;
+import org.spongycastle.jce.exception.ExtException;
public class AnnotatedException
extends Exception
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProvider.java
index 0e925f8f..7d9dae3b 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProvider.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.security.AccessController;
@@ -9,19 +9,19 @@ import java.security.PublicKey;
import java.util.HashMap;
import java.util.Map;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
/**
* To add the provider at runtime use:
* <pre>
* import java.security.Security;
- * import org.bouncycastle.jce.provider.BouncyCastleProvider;
+ * import org.spongycastle.jce.provider.BouncyCastleProvider;
*
* Security.addProvider(new BouncyCastleProvider());
* </pre>
@@ -33,7 +33,7 @@ import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
* a line:
* <pre>
* <code>
- * security.provider.&lt;n&gt;=org.bouncycastle.jce.provider.BouncyCastleProvider
+ * security.provider.&lt;n&gt;=org.spongycastle.jce.provider.BouncyCastleProvider
* </code>
* </pre>
* Where &lt;n&gt; is the preference you want the provider at (1 being the
@@ -46,7 +46,7 @@ public final class BouncyCastleProvider extends Provider
{
private static String info = "BouncyCastle Security Provider v1.51";
- public static final String PROVIDER_NAME = "BC";
+ public static final String PROVIDER_NAME = "SC";
public static final ProviderConfiguration CONFIGURATION = new BouncyCastleProviderConfiguration();
@@ -55,7 +55,7 @@ public final class BouncyCastleProvider extends Provider
/*
* Configurable symmetric ciphers
*/
- private static final String SYMMETRIC_PACKAGE = "org.bouncycastle.jcajce.provider.symmetric.";
+ private static final String SYMMETRIC_PACKAGE = "org.spongycastle.jcajce.provider.symmetric.";
private static final String[] SYMMETRIC_GENERIC =
{
@@ -78,7 +78,7 @@ public final class BouncyCastleProvider extends Provider
/*
* Configurable asymmetric ciphers
*/
- private static final String ASYMMETRIC_PACKAGE = "org.bouncycastle.jcajce.provider.asymmetric.";
+ private static final String ASYMMETRIC_PACKAGE = "org.spongycastle.jcajce.provider.asymmetric.";
// this one is required for GNU class path - it needs to be loaded first as the
// later ones configure it.
@@ -95,7 +95,7 @@ public final class BouncyCastleProvider extends Provider
/*
* Configurable digests
*/
- private static final String DIGEST_PACKAGE = "org.bouncycastle.jcajce.provider.digest.";
+ private static final String DIGEST_PACKAGE = "org.spongycastle.jcajce.provider.digest.";
private static final String[] DIGESTS =
{
"GOST3411", "MD2", "MD4", "MD5", "SHA1", "RIPEMD128", "RIPEMD160", "RIPEMD256", "RIPEMD320", "SHA224", "SHA256", "SHA384", "SHA512", "SHA3", "Skein", "SM3", "Tiger", "Whirlpool"
@@ -104,10 +104,10 @@ public final class BouncyCastleProvider extends Provider
/*
* Configurable keystores
*/
- private static final String KEYSTORE_PACKAGE = "org.bouncycastle.jcajce.provider.keystore.";
+ private static final String KEYSTORE_PACKAGE = "org.spongycastle.jcajce.provider.keystore.";
private static final String[] KEYSTORES =
{
- "BC", "PKCS12"
+ "SC", "PKCS12"
};
/**
@@ -148,44 +148,44 @@ public final class BouncyCastleProvider extends Provider
//
// X509Store
//
- put("X509Store.CERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertCollection");
- put("X509Store.ATTRIBUTECERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreAttrCertCollection");
- put("X509Store.CRL/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCRLCollection");
- put("X509Store.CERTIFICATEPAIR/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertPairCollection");
-
- put("X509Store.CERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCerts");
- put("X509Store.CRL/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCRLs");
- put("X509Store.ATTRIBUTECERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPAttrCerts");
- put("X509Store.CERTIFICATEPAIR/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCertPairs");
+ put("X509Store.CERTIFICATE/COLLECTION", "org.spongycastle.jce.provider.X509StoreCertCollection");
+ put("X509Store.ATTRIBUTECERTIFICATE/COLLECTION", "org.spongycastle.jce.provider.X509StoreAttrCertCollection");
+ put("X509Store.CRL/COLLECTION", "org.spongycastle.jce.provider.X509StoreCRLCollection");
+ put("X509Store.CERTIFICATEPAIR/COLLECTION", "org.spongycastle.jce.provider.X509StoreCertPairCollection");
+
+ put("X509Store.CERTIFICATE/LDAP", "org.spongycastle.jce.provider.X509StoreLDAPCerts");
+ put("X509Store.CRL/LDAP", "org.spongycastle.jce.provider.X509StoreLDAPCRLs");
+ put("X509Store.ATTRIBUTECERTIFICATE/LDAP", "org.spongycastle.jce.provider.X509StoreLDAPAttrCerts");
+ put("X509Store.CERTIFICATEPAIR/LDAP", "org.spongycastle.jce.provider.X509StoreLDAPCertPairs");
//
// X509StreamParser
//
- put("X509StreamParser.CERTIFICATE", "org.bouncycastle.jce.provider.X509CertParser");
- put("X509StreamParser.ATTRIBUTECERTIFICATE", "org.bouncycastle.jce.provider.X509AttrCertParser");
- put("X509StreamParser.CRL", "org.bouncycastle.jce.provider.X509CRLParser");
- put("X509StreamParser.CERTIFICATEPAIR", "org.bouncycastle.jce.provider.X509CertPairParser");
+ put("X509StreamParser.CERTIFICATE", "org.spongycastle.jce.provider.X509CertParser");
+ put("X509StreamParser.ATTRIBUTECERTIFICATE", "org.spongycastle.jce.provider.X509AttrCertParser");
+ put("X509StreamParser.CRL", "org.spongycastle.jce.provider.X509CRLParser");
+ put("X509StreamParser.CERTIFICATEPAIR", "org.spongycastle.jce.provider.X509CertPairParser");
//
// cipher engines
//
- put("Cipher.BROKENPBEWITHMD5ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithMD5AndDES");
+ put("Cipher.BROKENPBEWITHMD5ANDDES", "org.spongycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithMD5AndDES");
- put("Cipher.BROKENPBEWITHSHA1ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithSHA1AndDES");
+ put("Cipher.BROKENPBEWITHSHA1ANDDES", "org.spongycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithSHA1AndDES");
- put("Cipher.OLDPBEWITHSHAANDTWOFISH-CBC", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$OldPBEWithSHAAndTwofish");
+ put("Cipher.OLDPBEWITHSHAANDTWOFISH-CBC", "org.spongycastle.jce.provider.BrokenJCEBlockCipher$OldPBEWithSHAAndTwofish");
// Certification Path API
- put("CertPathValidator.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathValidatorSpi");
- put("CertPathBuilder.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathBuilderSpi");
- put("CertPathValidator.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi");
- put("CertPathBuilder.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi");
- put("CertPathValidator.PKIX", "org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi");
- put("CertPathBuilder.PKIX", "org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi");
- put("CertStore.Collection", "org.bouncycastle.jce.provider.CertStoreCollectionSpi");
- put("CertStore.LDAP", "org.bouncycastle.jce.provider.X509LDAPCertStoreSpi");
- put("CertStore.Multi", "org.bouncycastle.jce.provider.MultiCertStoreSpi");
+ put("CertPathValidator.RFC3281", "org.spongycastle.jce.provider.PKIXAttrCertPathValidatorSpi");
+ put("CertPathBuilder.RFC3281", "org.spongycastle.jce.provider.PKIXAttrCertPathBuilderSpi");
+ put("CertPathValidator.RFC3280", "org.spongycastle.jce.provider.PKIXCertPathValidatorSpi");
+ put("CertPathBuilder.RFC3280", "org.spongycastle.jce.provider.PKIXCertPathBuilderSpi");
+ put("CertPathValidator.PKIX", "org.spongycastle.jce.provider.PKIXCertPathValidatorSpi");
+ put("CertPathBuilder.PKIX", "org.spongycastle.jce.provider.PKIXCertPathBuilderSpi");
+ put("CertStore.Collection", "org.spongycastle.jce.provider.CertStoreCollectionSpi");
+ put("CertStore.LDAP", "org.spongycastle.jce.provider.X509LDAPCertStoreSpi");
+ put("CertStore.Multi", "org.spongycastle.jce.provider.MultiCertStoreSpi");
put("Alg.Alias.CertStore.X509LDAP", "LDAP");
}
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProviderConfiguration.java b/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java
index cda05e83..9421c517 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProviderConfiguration.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/BouncyCastleProviderConfiguration.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.Permission;
import javax.crypto.spec.DHParameterSpec;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jcajce.provider.config.ProviderConfigurationPermission;
-import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jcajce.provider.config.ProviderConfigurationPermission;
+import org.spongycastle.jce.spec.ECParameterSpec;
class BouncyCastleProviderConfiguration
implements ProviderConfiguration
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java b/prov/src/main/java/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java
index cb88e208..95304581 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/BrokenJCEBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -23,25 +23,25 @@ import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-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.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.util.Strings;
+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.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+import org.spongycastle.crypto.modes.CBCBlockCipher;
+import org.spongycastle.crypto.modes.CFBBlockCipher;
+import org.spongycastle.crypto.modes.CTSBlockCipher;
+import org.spongycastle.crypto.modes.OFBBlockCipher;
+import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.crypto.params.RC2Parameters;
+import org.spongycastle.crypto.params.RC5Parameters;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.util.Strings;
public class BrokenJCEBlockCipher
implements BrokenPBE
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java b/prov/src/main/java/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java
index e6186f67..0e7343e7 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/BrokenKDF2BytesGenerator.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.KDFParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.DerivationFunction;
+import org.spongycastle.crypto.DerivationParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.params.KDFParameters;
/**
* Generator for PBE derived keys and ivs as defined by IEEE P1363a
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java b/prov/src/main/java/org/spongycastle/jce/provider/BrokenPBE.java
index a1736253..6fb4a7ec 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/BrokenPBE.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.spec.PBEParameterSpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.PBEParametersGenerator;
+import org.spongycastle.crypto.digests.MD5Digest;
+import org.spongycastle.crypto.digests.RIPEMD160Digest;
+import org.spongycastle.crypto.digests.SHA1Digest;
+import org.spongycastle.crypto.generators.PKCS12ParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS5S1ParametersGenerator;
+import org.spongycastle.crypto.generators.PKCS5S2ParametersGenerator;
+import org.spongycastle.crypto.params.KeyParameter;
+import org.spongycastle.crypto.params.ParametersWithIV;
+import org.spongycastle.jcajce.provider.symmetric.util.BCPBEKey;
/**
* Generator for PBE derived keys and ivs as defined by PKCS 12 V1.0,
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java b/prov/src/main/java/org/spongycastle/jce/provider/CertPathValidatorUtilities.java
index 964d0394..29415522 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/CertPathValidatorUtilities.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -37,42 +37,42 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.isismtt.ISISMTTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509Store;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1OutputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.isismtt.ISISMTTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLReason;
+import org.spongycastle.asn1.x509.DistributionPoint;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.jce.exception.ExtCertPathValidatorException;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.ExtendedPKIXBuilderParameters;
+import org.spongycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.x509.X509AttributeCertStoreSelector;
+import org.spongycastle.x509.X509AttributeCertificate;
+import org.spongycastle.x509.X509CRLStoreSelector;
+import org.spongycastle.x509.X509CertStoreSelector;
+import org.spongycastle.x509.X509Store;
public class CertPathValidatorUtilities
{
@@ -706,7 +706,7 @@ public class CertPathValidatorUtilities
* @param certStores a List containing only {@link X509Store} objects. These
* are used to search for certificates.
* @return a Collection of all found {@link X509Certificate} or
- * {@link org.bouncycastle.x509.X509AttributeCertificate} objects.
+ * {@link org.spongycastle.x509.X509AttributeCertificate} objects.
* May be empty but never <code>null</code>.
*/
protected static Collection findCertificates(X509CertStoreSelector certSelect,
@@ -1162,7 +1162,7 @@ public class CertPathValidatorUtilities
*
* @param dp The distribution point for which the complete CRL
* @param cert The <code>X509Certificate</code> or
- * {@link org.bouncycastle.x509.X509AttributeCertificate} for
+ * {@link org.spongycastle.x509.X509AttributeCertificate} for
* which the CRL should be searched.
* @param currentDate The date for which the delta CRLs must be valid.
* @param paramsPKIX The extended PKIX parameters.
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/CertStatus.java b/prov/src/main/java/org/spongycastle/jce/provider/CertStatus.java
index ba3da165..531f340e 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/CertStatus.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/CertStatus.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Date;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/CertStoreCollectionSpi.java
index 210d986d..5467e16e 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/CertStoreCollectionSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidAlgorithmParameterException;
import java.security.cert.CRL;
@@ -25,7 +25,7 @@ public class CertStoreCollectionSpi extends CertStoreSpi
if (!(params instanceof CollectionCertStoreParameters))
{
- throw new InvalidAlgorithmParameterException("org.bouncycastle.jce.provider.CertStoreCollectionSpi: parameter must be a CollectionCertStoreParameters object\n" + params.toString());
+ throw new InvalidAlgorithmParameterException("org.spongycastle.jce.provider.CertStoreCollectionSpi: parameter must be a CollectionCertStoreParameters object\n" + params.toString());
}
this.params = (CollectionCertStoreParameters)params;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/DHUtil.java b/prov/src/main/java/org/spongycastle/jce/provider/DHUtil.java
index 2470af99..deea1773 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/DHUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/DHUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -7,14 +7,14 @@ import java.security.PublicKey;
import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.interfaces.DHPublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.DHParameters;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
/**
* utility class for converting jce/jca DH objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class DHUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/ExtCRLException.java b/prov/src/main/java/org/spongycastle/jce/provider/ExtCRLException.java
index 3bc820f3..11e2d7fd 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/ExtCRLException.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/ExtCRLException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.cert.CRLException;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPrivateKey.java
index a30b2df7..e7644174 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,20 +10,20 @@ import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPrivateKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x9.DHDomainParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DHPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class JCEDHPrivateKey
implements DHPrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPublicKey.java
index 3e6a09a6..c53e89d6 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEDHPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,17 +9,17 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.DHParameter;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.DHDomainParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DHPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
public class JCEDHPublicKey
implements DHPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEECPrivateKey.java
index 67e40b40..abb0364b 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEECPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -11,35 +11,35 @@ import java.security.spec.ECPrivateKeySpec;
import java.security.spec.EllipticCurve;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.sec.ECPrivateKeyStructure;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.sec.ECPrivateKeyStructure;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X962Parameters;
+import org.spongycastle.asn1.x9.X9ECParameters;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
public class JCEECPrivateKey
- implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
+ implements ECPrivateKey, org.spongycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
{
private String algorithm = "EC";
private BigInteger d;
@@ -64,7 +64,7 @@ public class JCEECPrivateKey
public JCEECPrivateKey(
String algorithm,
- org.bouncycastle.jce.spec.ECPrivateKeySpec spec)
+ org.spongycastle.jce.spec.ECPrivateKeySpec spec)
{
this.algorithm = algorithm;
this.d = spec.getD();
@@ -141,7 +141,7 @@ public class JCEECPrivateKey
String algorithm,
ECPrivateKeyParameters params,
JCEECPublicKey pubKey,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -353,7 +353,7 @@ public class JCEECPrivateKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null)
{
@@ -363,7 +363,7 @@ public class JCEECPrivateKey
return EC5Util.convertSpec(ecSpec, withCompression);
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEECPublicKey.java
index c82be8ca..7f550e05 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEECPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,42 +10,42 @@ import java.security.spec.ECPoint;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-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.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+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.crypto.params.ECDomainParameters;
+import org.spongycastle.crypto.params.ECPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.EC5Util;
+import org.spongycastle.jcajce.provider.asymmetric.util.ECUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jce.ECGOST3410NamedCurveTable;
+import org.spongycastle.jce.interfaces.ECPointEncoder;
+import org.spongycastle.jce.spec.ECNamedCurveParameterSpec;
+import org.spongycastle.jce.spec.ECNamedCurveSpec;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.custom.sec.SecP256K1Point;
+import org.spongycastle.math.ec.custom.sec.SecP256R1Point;
public class JCEECPublicKey
- implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
+ implements ECPublicKey, org.spongycastle.jce.interfaces.ECPublicKey, ECPointEncoder
{
private String algorithm = "EC";
- private org.bouncycastle.math.ec.ECPoint q;
+ private org.spongycastle.math.ec.ECPoint q;
private ECParameterSpec ecSpec;
private boolean withCompression;
private GOST3410PublicKeyAlgParameters gostParams;
@@ -72,7 +72,7 @@ public class JCEECPublicKey
public JCEECPublicKey(
String algorithm,
- org.bouncycastle.jce.spec.ECPublicKeySpec spec)
+ org.spongycastle.jce.spec.ECPublicKeySpec spec)
{
this.algorithm = algorithm;
this.q = spec.getQ();
@@ -88,7 +88,7 @@ public class JCEECPublicKey
{
if (q.getCurve() == null)
{
- org.bouncycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
+ org.spongycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
q = s.getCurve().createPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger(), false);
}
@@ -121,7 +121,7 @@ public class JCEECPublicKey
public JCEECPublicKey(
String algorithm,
ECPublicKeyParameters params,
- org.bouncycastle.jce.spec.ECParameterSpec spec)
+ org.spongycastle.jce.spec.ECParameterSpec spec)
{
ECDomainParameters dp = params.getParameters();
@@ -422,7 +422,7 @@ public class JCEECPublicKey
return ecSpec;
}
- public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
+ public org.spongycastle.jce.spec.ECParameterSpec getParameters()
{
if (ecSpec == null) // implictlyCA
{
@@ -437,7 +437,7 @@ public class JCEECPublicKey
return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
}
- public org.bouncycastle.math.ec.ECPoint getQ()
+ public org.spongycastle.math.ec.ECPoint getQ()
{
if (ecSpec == null)
{
@@ -447,12 +447,12 @@ public class JCEECPublicKey
return q;
}
- public org.bouncycastle.math.ec.ECPoint engineGetQ()
+ public org.spongycastle.math.ec.ECPoint engineGetQ()
{
return q;
}
- org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
+ org.spongycastle.jce.spec.ECParameterSpec engineGetSpec()
{
if (ecSpec != null)
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java
index 6c21f876..4d98792c 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,20 +10,20 @@ import javax.crypto.interfaces.DHPrivateKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPrivateKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.ElGamalPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.ElGamalPrivateKey;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.jce.spec.ElGamalPrivateKeySpec;
public class JCEElGamalPrivateKey
implements ElGamalPrivateKey, DHPrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPublicKey.java
index 30780c85..20844456 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEElGamalPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,16 +9,16 @@ import javax.crypto.interfaces.DHPublicKey;
import javax.crypto.spec.DHParameterSpec;
import javax.crypto.spec.DHPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.oiw.ElGamalParameter;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.params.ElGamalPublicKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jce.interfaces.ElGamalPublicKey;
+import org.spongycastle.jce.spec.ElGamalParameterSpec;
+import org.spongycastle.jce.spec.ElGamalPublicKeySpec;
public class JCEElGamalPublicKey
implements ElGamalPublicKey, DHPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java
index f9bb5dd3..59508029 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateCrtKey.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.math.BigInteger;
import java.security.interfaces.RSAPrivateCrtKey;
import java.security.spec.RSAPrivateCrtKeySpec;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.pkcs.RSAPrivateKey;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.RSAPrivateCrtKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
/**
* A provider representation for a RSA private key, with CRT factors included.
@@ -30,7 +30,7 @@ public class JCERSAPrivateCrtKey
private BigInteger crtCoefficient;
/**
- * construct a private key from it's org.bouncycastle.crypto equivalent.
+ * construct a private key from it's org.spongycastle.crypto equivalent.
*
* @param key the parameters object representing the private key.
*/
@@ -90,7 +90,7 @@ public class JCERSAPrivateCrtKey
PrivateKeyInfo info)
throws IOException
{
- this(org.bouncycastle.asn1.pkcs.RSAPrivateKey.getInstance(info.parsePrivateKey()));
+ this(org.spongycastle.asn1.pkcs.RSAPrivateKey.getInstance(info.parsePrivateKey()));
}
/**
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateKey.java
index cacedd4b..f7f6f88f 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -8,15 +8,15 @@ import java.security.interfaces.RSAPrivateKey;
import java.security.spec.RSAPrivateKeySpec;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class JCERSAPrivateKey
implements RSAPrivateKey, PKCS12BagAttributeCarrier
@@ -77,7 +77,7 @@ public class JCERSAPrivateKey
public byte[] getEncoded()
{
- return KeyUtil.getEncodedPrivateKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new org.bouncycastle.asn1.pkcs.RSAPrivateKey(getModulus(), ZERO, getPrivateExponent(), ZERO, ZERO, ZERO, ZERO, ZERO));
+ return KeyUtil.getEncodedPrivateKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new org.spongycastle.asn1.pkcs.RSAPrivateKey(getModulus(), ZERO, getPrivateExponent(), ZERO, ZERO, ZERO, ZERO, ZERO));
}
public boolean equals(Object o)
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPublicKey.java
index a09295d5..63d14295 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCERSAPublicKey.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.math.BigInteger;
import java.security.interfaces.RSAPublicKey;
import java.security.spec.RSAPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.RSAPublicKeyStructure;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.RSAPublicKeyStructure;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.params.RSAKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.KeyUtil;
public class JCERSAPublicKey
implements RSAPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java b/prov/src/main/java/org/spongycastle/jce/provider/JCEStreamCipher.java
index 68ef472d..64346b2a 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JCEStreamCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
@@ -27,21 +27,21 @@ import javax.crypto.spec.RC2ParameterSpec;
import javax.crypto.spec.RC5ParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-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.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.crypto.engines.BlowfishEngine;
+import org.spongycastle.crypto.engines.DESEngine;
+import org.spongycastle.crypto.engines.DESedeEngine;
+import org.spongycastle.crypto.engines.SkipjackEngine;
+import org.spongycastle.crypto.engines.TwofishEngine;
+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.jcajce.provider.symmetric.util.BCPBEKey;
+import org.spongycastle.jcajce.provider.symmetric.util.PBE;
public class JCEStreamCipher
extends CipherSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPrivateKey.java
index 3bd6d307..3a9da836 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPrivateKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -10,17 +10,17 @@ import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPrivateKeySpec;
import java.util.Enumeration;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DSAPrivateKeyParameters;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
public class JDKDSAPrivateKey
implements DSAPrivateKey, PKCS12BagAttributeCarrier
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java b/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPublicKey.java
index 80bbf3c5..78e8c09e 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JDKDSAPublicKey.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -9,15 +9,15 @@ import java.security.interfaces.DSAPublicKey;
import java.security.spec.DSAParameterSpec;
import java.security.spec.DSAPublicKeySpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DSAParameter;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.crypto.params.DSAPublicKeyParameters;
public class JDKDSAPublicKey
implements DSAPublicKey
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12StoreParameter.java b/prov/src/main/java/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java
index 7e8340aa..93e31df3 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12StoreParameter.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/JDKPKCS12StoreParameter.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.OutputStream;
import java.security.KeyStore;
@@ -6,7 +6,7 @@ import java.security.KeyStore.LoadStoreParameter;
import java.security.KeyStore.ProtectionParameter;
/**
- * @deprecated use org.bouncycastle.jcajce.config.PKCS12StoreParameter
+ * @deprecated use org.spongycastle.jcajce.config.PKCS12StoreParameter
*/
public class JDKPKCS12StoreParameter implements LoadStoreParameter
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/MultiCertStoreSpi.java
index cf3d15d7..05855dec 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/MultiCertStoreSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidAlgorithmParameterException;
import java.security.cert.CRLSelector;
@@ -13,7 +13,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.bouncycastle.jce.MultiCertStoreParameters;
+import org.spongycastle.jce.MultiCertStoreParameters;
public class MultiCertStoreSpi
extends CertStoreSpi
@@ -27,7 +27,7 @@ public class MultiCertStoreSpi
if (!(params instanceof MultiCertStoreParameters))
{
- throw new InvalidAlgorithmParameterException("org.bouncycastle.jce.provider.MultiCertStoreSpi: parameter must be a MultiCertStoreParameters object\n" + params.toString());
+ throw new InvalidAlgorithmParameterException("org.spongycastle.jce.provider.MultiCertStoreSpi: parameter must be a MultiCertStoreParameters object\n" + params.toString());
}
this.params = (MultiCertStoreParameters)params;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PEMUtil.java b/prov/src/main/java/org/spongycastle/jce/provider/PEMUtil.java
index 04718efc..989d2ecc 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PEMUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PEMUtil.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.io.InputStream;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.util.encoders.Base64;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.util.encoders.Base64;
public class PEMUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
index 14aef43e..bf190f57 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
@@ -24,12 +24,12 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.jce.exception.ExtCertPathBuilderException;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CertStoreSelector;
+import org.spongycastle.jce.exception.ExtCertPathBuilderException;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.ExtendedPKIXBuilderParameters;
+import org.spongycastle.x509.X509AttributeCertStoreSelector;
+import org.spongycastle.x509.X509AttributeCertificate;
+import org.spongycastle.x509.X509CertStoreSelector;
public class PKIXAttrCertPathBuilderSpi
extends CertPathBuilderSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
index c1759bac..91db8144 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidAlgorithmParameterException;
import java.security.cert.CertPath;
@@ -10,16 +10,16 @@ import java.security.cert.X509Certificate;
import java.util.Date;
import java.util.Set;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
+import org.spongycastle.jce.exception.ExtCertPathValidatorException;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.x509.X509AttributeCertStoreSelector;
+import org.spongycastle.x509.X509AttributeCertificate;
/**
* CertPathValidatorSpi implementation for X.509 Attribute Certificates la RFC 3281.
*
- * @see org.bouncycastle.x509.ExtendedPKIXParameters
+ * @see org.spongycastle.x509.ExtendedPKIXParameters
*/
public class PKIXAttrCertPathValidatorSpi
extends CertPathValidatorSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCRLUtil.java
index c94016d7..db590e7b 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCRLUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.cert.CertStore;
import java.security.cert.CertStoreException;
@@ -12,10 +12,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509Store;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.x509.X509CRLStoreSelector;
+import org.spongycastle.x509.X509Store;
public class PKIXCRLUtil
{
@@ -95,7 +95,7 @@ public class PKIXCRLUtil
* @param crlSelect a {@link X509CRLStoreSelector} object that will be used
* to select the CRLs
* @param crlStores a List containing only
- * {@link org.bouncycastle.x509.X509Store X509Store} objects.
+ * {@link org.spongycastle.x509.X509Store X509Store} objects.
* These are used to search for CRLs
*
* @return a Collection of all found {@link java.security.cert.X509CRL X509CRL} objects. May be
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java
index 384eb861..e060b4f0 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathBuilderSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidAlgorithmParameterException;
import java.security.cert.CertPath;
@@ -19,10 +19,10 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import org.bouncycastle.jce.exception.ExtCertPathBuilderException;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.X509CertStoreSelector;
+import org.spongycastle.jce.exception.ExtCertPathBuilderException;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.ExtendedPKIXBuilderParameters;
+import org.spongycastle.x509.X509CertStoreSelector;
/**
* Implements the PKIX CertPathBuilding algorithm for BouncyCastle.
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java
index 0e62bfc6..df0e2467 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXCertPathValidatorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.InvalidAlgorithmParameterException;
import java.security.PublicKey;
@@ -20,11 +20,11 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.jce.exception.ExtCertPathValidatorException;
+import org.spongycastle.x509.ExtendedPKIXParameters;
/**
* CertPathValidatorSpi implementation for X.509 Certificate validation � la RFC
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidator.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java
index 7ecc4860..ee944a8d 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidator.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
import java.util.Collections;
@@ -8,14 +8,14 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralSubtree;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.Strings;
public class PKIXNameConstraintValidator
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidatorException.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java
index b06d5e5b..3f4bef58 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXNameConstraintValidatorException.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXNameConstraintValidatorException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
public class PKIXNameConstraintValidatorException
extends Exception
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java b/prov/src/main/java/org/spongycastle/jce/provider/PKIXPolicyNode.java
index 34376055..10b15b33 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/PKIXPolicyNode.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.security.cert.PolicyNode;
import java.util.ArrayList;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java b/prov/src/main/java/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java
index 881ceeb9..a8961570 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3280CertPathUtilities.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/RFC3280CertPathUtilities.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.math.BigInteger;
@@ -30,34 +30,34 @@ import java.util.Vector;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.NameConstraints;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLReason;
+import org.spongycastle.asn1.x509.DistributionPoint;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.GeneralSubtree;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.NameConstraints;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.exception.ExtCertPathValidatorException;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.x509.ExtendedPKIXBuilderParameters;
+import org.spongycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.x509.X509CRLStoreSelector;
+import org.spongycastle.x509.X509CertStoreSelector;
public class RFC3280CertPathUtilities
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java b/prov/src/main/java/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java
index 19dbae1d..f90154c1 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/RFC3281CertPathUtilities.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.security.InvalidAlgorithmParameterException;
@@ -26,22 +26,22 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.PKIXAttrCertChecker;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CertStoreSelector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLReason;
+import org.spongycastle.asn1.x509.DistributionPoint;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.TargetInformation;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.jce.exception.ExtCertPathValidatorException;
+import org.spongycastle.x509.ExtendedPKIXBuilderParameters;
+import org.spongycastle.x509.ExtendedPKIXParameters;
+import org.spongycastle.x509.PKIXAttrCertChecker;
+import org.spongycastle.x509.X509AttributeCertificate;
+import org.spongycastle.x509.X509CertStoreSelector;
class RFC3281CertPathUtilities
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java b/prov/src/main/java/org/spongycastle/jce/provider/ReasonsMask.java
index 04f5a063..dad7acaa 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/ReasonsMask.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/ReasonsMask.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
-import org.bouncycastle.asn1.x509.ReasonFlags;
+import org.spongycastle.asn1.x509.ReasonFlags;
/**
* This class helps to handle CRL revocation reasons mask. Each CRL handles a
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java b/prov/src/main/java/org/spongycastle/jce/provider/X509AttrCertParser.java
index 08f61c2b..2ee524da 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509AttrCertParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -7,17 +7,17 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.X509V2AttributeCertificate;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.x509.X509AttributeCertificate;
+import org.spongycastle.x509.X509StreamParserSpi;
+import org.spongycastle.x509.X509V2AttributeCertificate;
+import org.spongycastle.x509.util.StreamParsingException;
public class X509AttrCertParser
extends X509StreamParserSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLEntryObject.java
index 7e76a897..348c3ab2 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLEntryObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.math.BigInteger;
@@ -11,19 +11,19 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.CRLReason;
-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.TBSCertList;
-import org.bouncycastle.asn1.x509.X509Extension;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.CRLReason;
+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.TBSCertList;
+import org.spongycastle.asn1.x509.X509Extension;
/**
* The following extensions are listed in RFC 2459 as relevant to CRL Entries
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLObject.java
index b5b4f13a..2f94b875 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.math.BigInteger;
@@ -24,24 +24,24 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.CRLDistPoint;
+import org.spongycastle.asn1.x509.CRLNumber;
+import org.spongycastle.asn1.x509.CertificateList;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.util.encoders.Hex;
/**
* The following extensions are listed in RFC 2459 as relevant to CRLs
@@ -556,7 +556,7 @@ public class X509CRLObject
{
try
{
- issuer = org.bouncycastle.asn1.x509.Certificate.getInstance(cert.getEncoded()).getIssuer();
+ issuer = org.spongycastle.asn1.x509.Certificate.getInstance(cert.getEncoded()).getIssuer();
}
catch (CertificateEncodingException e)
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLParser.java
index 0d1eca72..cf066357 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CRLParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -9,16 +9,16 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.asn1.x509.CertificateList;
+import org.spongycastle.x509.X509StreamParserSpi;
+import org.spongycastle.x509.util.StreamParsingException;
public class X509CRLParser
extends X509StreamParserSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CertPairParser.java
index 41d64480..af106769 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CertPairParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -8,12 +8,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.x509.X509CertificatePair;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.CertificatePair;
+import org.spongycastle.x509.X509CertificatePair;
+import org.spongycastle.x509.X509StreamParserSpi;
+import org.spongycastle.x509.util.StreamParsingException;
public class X509CertPairParser
extends X509StreamParserSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CertParser.java
index 0663735b..455310cf 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CertParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -9,15 +9,15 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.SignedData;
+import org.spongycastle.x509.X509StreamParserSpi;
+import org.spongycastle.x509.util.StreamParsingException;
public class X509CertParser
extends X509StreamParserSpi
@@ -48,7 +48,7 @@ public class X509CertParser
}
return new X509CertificateObject(
- org.bouncycastle.asn1.x509.Certificate.getInstance(seq));
+ org.spongycastle.asn1.x509.Certificate.getInstance(seq));
}
private Certificate getCertificate()
@@ -63,7 +63,7 @@ public class X509CertParser
if (obj instanceof ASN1Sequence)
{
return new X509CertificateObject(
- org.bouncycastle.asn1.x509.Certificate.getInstance(obj));
+ org.spongycastle.asn1.x509.Certificate.getInstance(obj));
}
}
}
@@ -80,7 +80,7 @@ public class X509CertParser
if (seq != null)
{
return new X509CertificateObject(
- org.bouncycastle.asn1.x509.Certificate.getInstance(seq));
+ org.spongycastle.asn1.x509.Certificate.getInstance(seq));
}
return null;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java b/prov/src/main/java/org/spongycastle/jce/provider/X509CertificateObject.java
index 97ff6f98..ff89d574 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509CertificateObject.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -32,43 +32,43 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-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.ASN1String;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.asn1.misc.NetscapeRevocationURL;
-import org.bouncycastle.asn1.misc.VerisignCzagExtension;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+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.ASN1String;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.misc.MiscObjectIdentifiers;
+import org.spongycastle.asn1.misc.NetscapeCertType;
+import org.spongycastle.asn1.misc.NetscapeRevocationURL;
+import org.spongycastle.asn1.misc.VerisignCzagExtension;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.style.RFC4519Style;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.BasicConstraints;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.KeyUsage;
+import org.spongycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Integers;
+import org.spongycastle.util.encoders.Hex;
public class X509CertificateObject
extends X509Certificate
implements PKCS12BagAttributeCarrier
{
- private org.bouncycastle.asn1.x509.Certificate c;
+ private org.spongycastle.asn1.x509.Certificate c;
private BasicConstraints basicConstraints;
private boolean[] keyUsage;
private boolean hashValueSet;
@@ -77,7 +77,7 @@ public class X509CertificateObject
private PKCS12BagAttributeCarrier attrCarrier = new PKCS12BagAttributeCarrierImpl();
public X509CertificateObject(
- org.bouncycastle.asn1.x509.Certificate c)
+ org.spongycastle.asn1.x509.Certificate c)
throws CertificateParsingException
{
this.c = c;
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java b/prov/src/main/java/org/spongycastle/jce/provider/X509LDAPCertStoreSpi.java
index 3797607c..3f629eca 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509LDAPCertStoreSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -31,9 +31,9 @@ import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.x509.CertificatePair;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
/**
*
@@ -41,7 +41,7 @@ import org.bouncycastle.jce.X509LDAPCertStoreParameters;
* from a LDAP location.
* <p>
* At first a search is performed in the ldap*AttributeNames of the
- * {@link org.bouncycastle.jce.X509LDAPCertStoreParameters} with the given
+ * {@link org.spongycastle.jce.X509LDAPCertStoreParameters} with the given
* information of the subject (for all kind of certificates) or issuer (for
* CRLs), respectively, if a X509CertSelector is given with that details. For
* CRLs, CA certificates and cross certificates a coarse search is made only for
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java b/prov/src/main/java/org/spongycastle/jce/provider/X509SignatureUtil.java
index eb1e556e..c1beb466 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509SignatureUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.io.IOException;
import java.security.AlgorithmParameters;
@@ -9,19 +9,19 @@ import java.security.Signature;
import java.security.SignatureException;
import java.security.spec.PSSParameterSpec;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Null;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
class X509SignatureUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java
index 7e2dc6a3..25102f35 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreAttrCertCollection.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
+import org.spongycastle.util.CollectionStore;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.X509CollectionStoreParameters;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
public class X509StoreAttrCertCollection
extends X509StoreSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCRLCollection.java
index b914f171..46b75c23 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCRLCollection.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
+import org.spongycastle.util.CollectionStore;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.X509CollectionStoreParameters;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
public class X509StoreCRLCollection
extends X509StoreSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertCollection.java
index db88f316..616de533 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertCollection.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
+import org.spongycastle.util.CollectionStore;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.X509CollectionStoreParameters;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
public class X509StoreCertCollection
extends X509StoreSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertPairCollection.java
index e67c25ba..bd8f8ea8 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreCertPairCollection.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
+import org.spongycastle.util.CollectionStore;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.X509CollectionStoreParameters;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
/**
* This class is a collection based Bouncy Castle
- * {@link org.bouncycastle.x509.X509Store} SPI implementation for certificate
+ * {@link org.spongycastle.x509.X509Store} SPI implementation for certificate
* pairs.
*
- * @see org.bouncycastle.x509.X509Store
- * @see org.bouncycastle.x509.X509CertificatePair
+ * @see org.spongycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509CertificatePair
*/
public class X509StoreCertPairCollection extends X509StoreSpi
{
@@ -51,8 +51,8 @@ public class X509StoreCertPairCollection extends X509StoreSpi
* <code>selector</code>.
* <p/>
* The returned collection contains
- * {@link org.bouncycastle.x509.X509CertificatePair}s. The selector must be
- * a {@link org.bouncycastle.x509.X509CertPairStoreSelector} to select
+ * {@link org.spongycastle.x509.X509CertificatePair}s. The selector must be
+ * a {@link org.spongycastle.x509.X509CertPairStoreSelector} to select
* certificate pairs.
*
* @return A collection with matching certificate pairs.
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPAttrCerts.java
index 96baa129..45057c10 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPAttrCerts.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.X509AttributeCertStoreSelector;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
+import org.spongycastle.x509.util.LDAPStoreHelper;
/**
* A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
* attribute certificates from an LDAP directory.
*
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509Store
*/
public class X509StoreLDAPAttrCerts extends X509StoreSpi
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCRLs.java
index 5f4dfb48..c16498e8 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCRLs.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.X509CRLStoreSelector;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
+import org.spongycastle.x509.util.LDAPStoreHelper;
/**
* A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
* certificate revocation lists from an LDAP directory.
*
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509Store
*/
public class X509StoreLDAPCRLs extends X509StoreSpi
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCertPairs.java
index f5687d8c..8def9725 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCertPairs.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.X509CertPairStoreSelector;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
+import org.spongycastle.x509.util.LDAPStoreHelper;
/**
* A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
* cross certificates pairs from an LDAP directory.
*
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509Store
*/
public class X509StoreLDAPCertPairs extends X509StoreSpi
{
diff --git a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCerts.java
index dd811a17..ac6ea191 100644
--- a/prov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java
+++ b/prov/src/main/java/org/spongycastle/jce/provider/X509StoreLDAPCerts.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.provider;
+package org.spongycastle.jce.provider;
import java.util.Collection;
import java.util.Collections;
@@ -6,21 +6,21 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509CertificatePair;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.X509CertPairStoreSelector;
+import org.spongycastle.x509.X509CertStoreSelector;
+import org.spongycastle.x509.X509CertificatePair;
+import org.spongycastle.x509.X509StoreParameters;
+import org.spongycastle.x509.X509StoreSpi;
+import org.spongycastle.x509.util.LDAPStoreHelper;
/**
* A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
* certificates form a LDAP directory.
*
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509Store
*/
public class X509StoreLDAPCerts
extends X509StoreSpi
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECKeySpec.java
index 12157844..42ff1db3 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.KeySpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveGenParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveGenParameterSpec.java
index a5dd319c..2b1d0404 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveGenParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveGenParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveParameterSpec.java
index 4e749a58..f10a0b41 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveParameterSpec.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
/**
* specification signifying that the curve parameters can also be
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveSpec.java
index c1b5ccc6..681d7070 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECNamedCurveSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECNamedCurveSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
import java.security.spec.ECFieldF2m;
@@ -6,8 +6,8 @@ import java.security.spec.ECFieldFp;
import java.security.spec.ECPoint;
import java.security.spec.EllipticCurve;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECAlgorithms;
+import org.spongycastle.math.ec.ECCurve;
/**
* specification signifying that the curve parameters can also be
@@ -48,7 +48,7 @@ public class ECNamedCurveSpec
}
private static ECPoint convertPoint(
- org.bouncycastle.math.ec.ECPoint g)
+ org.spongycastle.math.ec.ECPoint g)
{
g = g.normalize();
return new ECPoint(g.getAffineXCoord().toBigInteger(), g.getAffineYCoord().toBigInteger());
@@ -57,7 +57,7 @@ public class ECNamedCurveSpec
public ECNamedCurveSpec(
String name,
ECCurve curve,
- org.bouncycastle.math.ec.ECPoint g,
+ org.spongycastle.math.ec.ECPoint g,
BigInteger n)
{
super(convertCurve(curve, null), convertPoint(g), n, 1);
@@ -79,7 +79,7 @@ public class ECNamedCurveSpec
public ECNamedCurveSpec(
String name,
ECCurve curve,
- org.bouncycastle.math.ec.ECPoint g,
+ org.spongycastle.math.ec.ECPoint g,
BigInteger n,
BigInteger h)
{
@@ -103,7 +103,7 @@ public class ECNamedCurveSpec
public ECNamedCurveSpec(
String name,
ECCurve curve,
- org.bouncycastle.math.ec.ECPoint g,
+ org.spongycastle.math.ec.ECPoint g,
BigInteger n,
BigInteger h,
byte[] seed)
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECParameterSpec.java
index df91412c..f0f00e8c 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECParameterSpec.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.math.ec.ECCurve;
+import org.spongycastle.math.ec.ECPoint;
import java.math.BigInteger;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECPrivateKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECPrivateKeySpec.java
index 27885c40..36b0db12 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECPrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECPrivateKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ECPublicKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ECPublicKeySpec.java
index 0e21a5bc..e2888d38 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ECPublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ECPublicKeySpec.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
-import org.bouncycastle.math.ec.ECPoint;
+import org.spongycastle.math.ec.ECPoint;
/**
* Elliptic Curve public key specification
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalGenParameterSpec.java
index 200d2b4d..3e45484d 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalGenParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalKeySpec.java
index 5e3eb663..49d3f2f0 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.KeySpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalParameterSpec.java
index 10ed1c5d..276790f8 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalPrivateKeySpec.java
index 3a3c6e48..be023e34 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalPrivateKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalPublicKeySpec.java
index c0e6dba1..558730e5 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/ElGamalPublicKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/GOST28147ParameterSpec.java
index d03fbfe7..a721db93 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/GOST28147ParameterSpec.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
/**
* A parameter spec for the GOST-28147 cipher.
- * @deprecated use org.bouncycastle.jcajce.spec.GOST28147ParameterSpec
+ * @deprecated use org.spongycastle.jcajce.spec.GOST28147ParameterSpec
*/
public class GOST28147ParameterSpec
- extends org.bouncycastle.jcajce.spec.GOST28147ParameterSpec
+ extends org.spongycastle.jcajce.spec.GOST28147ParameterSpec
{
/**
* @deprecated
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410ParameterSpec.java
index 6e0980db..755a5284 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410ParameterSpec.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410NamedParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.cryptopro.GOST3410NamedParameters;
+import org.spongycastle.asn1.cryptopro.GOST3410ParamSetParameters;
+import org.spongycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+import org.spongycastle.jce.interfaces.GOST3410Params;
/**
* ParameterSpec for a GOST 3410-94 key.
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PrivateKeySpec.java
index 5ea13856..42822146 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PrivateKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
import java.security.spec.KeySpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java
index 9e4e650a..0b7af57e 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeySpec.java
index 7b65c064..a16d36ce 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/GOST3410PublicKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.math.BigInteger;
import java.security.spec.KeySpec;
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/IEKeySpec.java
index 9859a22b..050760f7 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/IEKeySpec.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.KeySpec;
-import org.bouncycastle.jce.interfaces.IESKey;
+import org.spongycastle.jce.interfaces.IESKey;
/**
* key pair for use with an integrated encryptor - together
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java b/prov/src/main/java/org/spongycastle/jce/spec/IESParameterSpec.java
index 16a5fa2f..d3fc0835 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/IESParameterSpec.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.util.Arrays;
/**
* Parameter spec for an integrated encryptor, as in IEEE P1363a
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/MQVPrivateKeySpec.java
index bdd988d0..84172600 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/MQVPrivateKeySpec.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.spec.KeySpec;
-import org.bouncycastle.jce.interfaces.MQVPrivateKey;
+import org.spongycastle.jce.interfaces.MQVPrivateKey;
/**
* Static/ephemeral private key (pair) for use with ECMQV key agreement
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/MQVPublicKeySpec.java
index 8b50d05f..f32c46fd 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/MQVPublicKeySpec.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
import java.security.PublicKey;
import java.security.spec.KeySpec;
-import org.bouncycastle.jce.interfaces.MQVPublicKey;
+import org.spongycastle.jce.interfaces.MQVPublicKey;
/**
* Static/ephemeral public key pair for use with ECMQV key agreement
diff --git a/prov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java b/prov/src/main/java/org/spongycastle/jce/spec/RepeatedSecretKeySpec.java
index 41110728..d3012ecd 100644
--- a/prov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/jce/spec/RepeatedSecretKeySpec.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.jce.spec;
+package org.spongycastle.jce.spec;
/**
* A simple object to indicate that a symmetric cipher should reuse the
* last key provided.
- * @deprecated use super class org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec
+ * @deprecated use super class org.spongycastle.jcajce.spec.RepeatedSecretKeySpec
*/
public class RepeatedSecretKeySpec
- extends org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec
+ extends org.spongycastle.jcajce.spec.RepeatedSecretKeySpec
{
private String algorithm;
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
index 340f0325..b237aee4 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider;
+package org.spongycastle.pqc.jcajce.provider;
import java.io.IOException;
import java.security.AccessController;
@@ -9,13 +9,13 @@ import java.security.PublicKey;
import java.util.HashMap;
import java.util.Map;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.config.ProviderConfiguration;
+import org.spongycastle.jcajce.provider.util.AlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
public class BouncyCastlePQCProvider
extends Provider
@@ -33,7 +33,7 @@ public class BouncyCastlePQCProvider
/*
* Configurable symmetric ciphers
*/
- private static final String ALGORITHM_PACKAGE = "org.bouncycastle.pqc.jcajce.provider.";
+ private static final String ALGORITHM_PACKAGE = "org.spongycastle.pqc.jcajce.provider.";
private static final String[] ALGORITHMS =
{
"Rainbow", "McEliece"
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/McEliece.java
index cb5f648b..06f16f85 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/McEliece.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.pqc.jcajce.provider;
+package org.spongycastle.pqc.jcajce.provider;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.pqc.asn1.PQCObjectIdentifiers;
public class McEliece
{
- private static final String PREFIX = "org.bouncycastle.pqc.jcajce.provider" + ".mceliece.";
+ private static final String PREFIX = "org.spongycastle.pqc.jcajce.provider" + ".mceliece.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/Rainbow.java
index 2a660285..7752c4bf 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/Rainbow.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.pqc.jcajce.provider;
+package org.spongycastle.pqc.jcajce.provider;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.jcajce.provider.rainbow.RainbowKeyFactorySpi;
+import org.spongycastle.jcajce.provider.config.ConfigurableProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.pqc.asn1.PQCObjectIdentifiers;
+import org.spongycastle.pqc.jcajce.provider.rainbow.RainbowKeyFactorySpi;
public class Rainbow
{
- private static final String PREFIX = "org.bouncycastle.pqc.jcajce.provider" + ".rainbow.";
+ private static final String PREFIX = "org.spongycastle.pqc.jcajce.provider" + ".rainbow.";
public static class Mappings
extends AsymmetricAlgorithmProvider
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java
index eacefaba..b3253160 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java
@@ -1,24 +1,24 @@
-package org.bouncycastle.pqc.jcajce.provider.gmss;
+package org.spongycastle.pqc.jcajce.provider.gmss;
import java.security.PublicKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.GMSSPublicKey;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.ParSet;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSPublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
-import org.bouncycastle.pqc.jcajce.spec.GMSSPublicKeySpec;
-import org.bouncycastle.util.encoders.Hex;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.pqc.asn1.GMSSPublicKey;
+import org.spongycastle.pqc.asn1.PQCObjectIdentifiers;
+import org.spongycastle.pqc.asn1.ParSet;
+import org.spongycastle.pqc.crypto.gmss.GMSSParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSPublicKeyParameters;
+import org.spongycastle.pqc.jcajce.provider.util.KeyUtil;
+import org.spongycastle.pqc.jcajce.spec.GMSSPublicKeySpec;
+import org.spongycastle.util.encoders.Hex;
/**
* This class implements the GMSS public key and is usually initiated by the <a
* href="GMSSKeyPairGenerator">GMSSKeyPairGenerator</a>.
*
- * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
- * @see org.bouncycastle.pqc.jcajce.spec.GMSSPublicKeySpec
+ * @see org.spongycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
+ * @see org.spongycastle.pqc.jcajce.spec.GMSSPublicKeySpec
*/
public class BCGMSSPublicKey
implements CipherParameters, PublicKey
@@ -47,7 +47,7 @@ public class BCGMSSPublicKey
*
* @param pub a raw GMSS public key
* @param gmssParameterSet an instance of GMSS Parameterset
- * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
+ * @see org.spongycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
*/
public BCGMSSPublicKey(byte[] pub, GMSSParameters gmssParameterSet)
{
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java
index 72400de3..0a22dd6f 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.security.PrivateKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.pqc.asn1.McElieceCCA2PrivateKey;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2mField;
+import org.spongycastle.pqc.math.linearalgebra.Permutation;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
/**
* This class implements a McEliece CCA2 private key and is usually instantiated
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java
index 3646933c..9c3361bc 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.security.PublicKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.pqc.asn1.McElieceCCA2PublicKey;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
/**
* This class implements a McEliece CCA2 public key and is usually instantiated
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java
index be93b311..21e778a4 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java
@@ -1,23 +1,23 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.security.PrivateKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McEliecePrivateKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.pqc.asn1.McEliecePrivateKey;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2mField;
+import org.spongycastle.pqc.math.linearalgebra.Permutation;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
/**
* This class implements a McEliece private key and is usually instantiated by
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java
index 4e278c9d..25c6fd14 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java
@@ -1,20 +1,20 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.security.PublicKey;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McEliecePublicKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.pqc.asn1.McEliecePublicKey;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
/**
* This class implements a McEliece public key and is usually instantiated by
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java
index c6ca7c2b..d3de79bf 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.math.BigInteger;
@@ -12,17 +12,17 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.pqc.asn1.McElieceCCA2PrivateKey;
+import org.spongycastle.pqc.asn1.McElieceCCA2PublicKey;
+import org.spongycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
+import org.spongycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
/**
* This class is used to translate between McEliece CCA2 keys and key
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java
index 03e7c1b9..a733d2a0 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
/**
* utility class for converting jce/jca McElieceCCA2 objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class McElieceCCA2KeysToParams
{
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java
index 2650fffe..a63c1852 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.Vector;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
+
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2Vector;
+import org.spongycastle.pqc.math.linearalgebra.GF2mField;
+import org.spongycastle.pqc.math.linearalgebra.GoppaCode;
+import org.spongycastle.pqc.math.linearalgebra.Permutation;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
+import org.spongycastle.pqc.math.linearalgebra.Vector;
/**
* Core operations for the CCA-secure variants of McEliece.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java
index 5320c220..77e31c6a 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.ByteArrayOutputStream;
import java.security.InvalidAlgorithmParameterException;
@@ -13,19 +13,19 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-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.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+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.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
+import org.spongycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
public class McElieceFujisakiCipherSpi
extends AsymmetricHybridCipher
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java
index c1df9e94..1c2007a0 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.IOException;
import java.math.BigInteger;
@@ -12,17 +12,17 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.pqc.asn1.McEliecePrivateKey;
-import org.bouncycastle.pqc.asn1.McEliecePublicKey;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.pqc.asn1.McEliecePrivateKey;
+import org.spongycastle.pqc.asn1.McEliecePublicKey;
+import org.spongycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
+import org.spongycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
/**
* This class is used to translate between McEliece keys and key specifications.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java
index 75008fef..9e0115fd 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPair;
@@ -6,19 +6,19 @@ import java.security.KeyPairGenerator;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2ParameterSpec;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+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.McElieceCCA2PrivateKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
+import org.spongycastle.pqc.crypto.mceliece.McElieceParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
+import org.spongycastle.pqc.jcajce.spec.McElieceCCA2ParameterSpec;
public abstract class McElieceKeyPairGeneratorSpi
extends KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java
index 23686b8c..649d1d45 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
/**
* utility class for converting jce/jca McEliece objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class McElieceKeysToParams
{
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java
index 36c62312..60e77a5c 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.ByteArrayOutputStream;
import java.security.InvalidAlgorithmParameterException;
@@ -13,19 +13,19 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-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.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+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.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
+import org.spongycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
public class McElieceKobaraImaiCipherSpi
extends AsymmetricHybridCipher
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java
index 583acbba..cbabfdcc 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
@@ -11,19 +11,19 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-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.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricBlockCipher;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+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.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceKeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
+import org.spongycastle.pqc.jcajce.provider.util.AsymmetricBlockCipher;
public class McEliecePKCSCipherSpi
extends AsymmetricBlockCipher
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java
index c9c67ea6..314b7a30 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
+package org.spongycastle.pqc.jcajce.provider.mceliece;
import java.io.ByteArrayOutputStream;
import java.security.InvalidAlgorithmParameterException;
@@ -13,19 +13,19 @@ import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-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.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.CipherParameters;
+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.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
+import org.spongycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
+import org.spongycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
public class McEliecePointchevalCipherSpi
extends AsymmetricHybridCipher
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java
index 62ea4e2b..114d2009 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.io.IOException;
import java.security.PrivateKey;
import java.util.Arrays;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.RainbowPrivateKey;
-import org.bouncycastle.pqc.crypto.rainbow.Layer;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.pqc.asn1.PQCObjectIdentifiers;
+import org.spongycastle.pqc.asn1.RainbowPrivateKey;
+import org.spongycastle.pqc.crypto.rainbow.Layer;
+import org.spongycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.rainbow.util.RainbowUtil;
+import org.spongycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
/**
* The Private key in Rainbow consists of the linear affine maps L1, L2 and the
@@ -186,11 +186,11 @@ public class BCRainbowPrivateKey
{
int hash = layers.length;
- hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(A1inv);
- hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(b1);
- hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(A2inv);
- hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(b2);
- hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(vi);
+ hash = hash * 37 + org.spongycastle.util.Arrays.hashCode(A1inv);
+ hash = hash * 37 + org.spongycastle.util.Arrays.hashCode(b1);
+ hash = hash * 37 + org.spongycastle.util.Arrays.hashCode(A2inv);
+ hash = hash * 37 + org.spongycastle.util.Arrays.hashCode(b2);
+ hash = hash * 37 + org.spongycastle.util.Arrays.hashCode(vi);
for (int i = layers.length - 1; i >= 0; i--)
{
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java
index 453cb615..12f16ed9 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.security.PublicKey;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.RainbowPublicKey;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.pqc.asn1.PQCObjectIdentifiers;
+import org.spongycastle.pqc.asn1.RainbowPublicKey;
+import org.spongycastle.pqc.crypto.rainbow.RainbowParameters;
+import org.spongycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
+import org.spongycastle.pqc.crypto.rainbow.util.RainbowUtil;
+import org.spongycastle.pqc.jcajce.provider.util.KeyUtil;
+import org.spongycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
+import org.spongycastle.util.Arrays;
/**
* This class implements CipherParameters and PublicKey.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java
index c08fb8b0..614e0796 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -11,14 +11,14 @@ import java.security.spec.KeySpec;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-import org.bouncycastle.pqc.asn1.RainbowPrivateKey;
-import org.bouncycastle.pqc.asn1.RainbowPublicKey;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
+import org.spongycastle.pqc.asn1.RainbowPrivateKey;
+import org.spongycastle.pqc.asn1.RainbowPublicKey;
+import org.spongycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
+import org.spongycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
/**
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java
index e64d53be..82239575 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyPair;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-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.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.RainbowParameterSpec;
+import org.spongycastle.crypto.AsymmetricCipherKeyPair;
+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.RainbowPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
+import org.spongycastle.pqc.jcajce.spec.RainbowParameterSpec;
public class RainbowKeyPairGeneratorSpi
extends java.security.KeyPairGenerator
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java
index f5c573a4..0ae006ef 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
+import org.spongycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
/**
* utility class for converting jce/jca Rainbow objects
- * objects into their org.bouncycastle.crypto counterparts.
+ * objects into their org.spongycastle.crypto counterparts.
*/
public class RainbowKeysToParams
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java
index e118ed68..01b12699 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
+package org.spongycastle.pqc.jcajce.provider.rainbow;
import java.security.InvalidKeyException;
import java.security.PrivateKey;
@@ -7,14 +7,14 @@ import java.security.SecureRandom;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-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.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowSigner;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.Digest;
+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.ParametersWithRandom;
+import org.spongycastle.pqc.crypto.rainbow.RainbowSigner;
/**
* Rainbow Signature class, extending the jce SignatureSpi.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java
index 29eb87c8..2e5678ad 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
+package org.spongycastle.pqc.jcajce.provider.util;
import java.io.ByteArrayOutputStream;
import java.security.InvalidAlgorithmParameterException;
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java
index 17b8811b..57d367b2 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
+package org.spongycastle.pqc.jcajce.provider.util;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/CipherSpiExt.java
index 3f4c8fcc..7978e2ae 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/CipherSpiExt.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
+package org.spongycastle.pqc.jcajce.provider.util;
import java.security.InvalidAlgorithmParameterException;
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/KeyUtil.java
index ba31e4d6..ae780b6d 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/provider/util/KeyUtil.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
+package org.spongycastle.pqc.jcajce.provider.util;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.pkcs.PrivateKeyInfo;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
public class KeyUtil
{
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java
index 517d9a0d..ad4b451b 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.InvalidParameterException;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialRingGF2;
/**
* This class provides a specification for the parameters that are used by the
* McEliece, McElieceCCA2, and Niederreiter key pair generators.
*
- * @see org.bouncycastle.pqc.ecc.mceliece.McElieceKeyPairGenerator
- * @see org.bouncycastle.pqc.ecc.mceliece.McElieceCCA2KeyPairGenerator
- * @see org.bouncycastle.pqc.ecc.niederreiter.NiederreiterKeyPairGenerator
+ * @see org.spongycastle.pqc.ecc.mceliece.McElieceKeyPairGenerator
+ * @see org.spongycastle.pqc.ecc.mceliece.McElieceCCA2KeyPairGenerator
+ * @see org.spongycastle.pqc.ecc.niederreiter.NiederreiterKeyPairGenerator
*/
public class ECCKeyGenParameterSpec
implements AlgorithmParameterSpec
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSKeySpec.java
index 7e469f0e..5af14102 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSKeySpec.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSParameters;
public class GMSSKeySpec
implements KeySpec
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java
index 150e9dc5..e61aca4c 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
import java.util.Vector;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.GMSSLeaf;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootCalc;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootSig;
-import org.bouncycastle.pqc.crypto.gmss.Treehash;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.pqc.crypto.gmss.GMSSLeaf;
+import org.spongycastle.pqc.crypto.gmss.GMSSParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSRootCalc;
+import org.spongycastle.pqc.crypto.gmss.GMSSRootSig;
+import org.spongycastle.pqc.crypto.gmss.Treehash;
+import org.spongycastle.util.Arrays;
/**
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java
index 441febd6..3da9c97c 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
+import org.spongycastle.pqc.crypto.gmss.GMSSParameters;
/**
* This class provides a specification for a GMSS public key.
*
- * @see org.bouncycastle.pqc.jcajce.provider.gmss.BCGMSSPublicKey
+ * @see org.spongycastle.pqc.jcajce.provider.gmss.BCGMSSPublicKey
*/
public class GMSSPublicKeySpec
extends GMSSKeySpec
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java
index d98a8f5e..76dd8e0f 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.AlgorithmParameterSpec;
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java
index efb27b5b..c13f8341 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java
@@ -1,11 +1,11 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2mField;
+import org.spongycastle.pqc.math.linearalgebra.Permutation;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
/**
* This class provides a specification for a McEliece CCA2 private key.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java
index 88a60b99..d5eb49ca 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
/**
* This class provides a specification for a McEliece CCA2 public key.
*
- * @see org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcElieceCCA2PublicKey
+ * @see org.spongycastle.pqc.jcajce.provider.mceliece.BCMcElieceCCA2PublicKey
*/
public class McElieceCCA2PublicKeySpec
implements KeySpec
@@ -42,7 +42,7 @@ public class McElieceCCA2PublicKeySpec
}
/**
- * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
+ * Constructor (used by {@link org.spongycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
*
* @param n length of the code
* @param t error correction capability of the code
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java
index 099fc2bf..6515ef93 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java
@@ -1,17 +1,17 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2mField;
+import org.spongycastle.pqc.math.linearalgebra.Permutation;
+import org.spongycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
/**
* This class provides a specification for a McEliece private key.
*
- * @see org.bouncycastle.pqc.ecc.JDKMcEliecePrivateKey.McEliecePrivateKey
+ * @see org.spongycastle.pqc.ecc.JDKMcEliecePrivateKey.McEliecePrivateKey
* @see KeySpec
*/
public class McEliecePrivateKeySpec
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java
index f5f18761..14797446 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java
@@ -1,14 +1,14 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
+import org.spongycastle.pqc.math.linearalgebra.GF2Matrix;
/**
* This class provides a specification for a McEliece public key.
*
- * @see org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcEliecePublicKey
+ * @see org.spongycastle.pqc.jcajce.provider.mceliece.BCMcEliecePublicKey
*/
public class McEliecePublicKeySpec
implements KeySpec
@@ -27,7 +27,7 @@ public class McEliecePublicKeySpec
private GF2Matrix g;
/**
- * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
+ * Constructor (used by {@link org.spongycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
*
* @param oid
* @param n the length of the code
@@ -43,7 +43,7 @@ public class McEliecePublicKeySpec
}
/**
- * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
+ * Constructor (used by {@link org.spongycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
*
* @param oid
* @param n the length of the code
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowParameterSpec.java
index 9fcc3f8f..936c0046 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowParameterSpec.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.AlgorithmParameterSpec;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.util.Arrays;
/**
* This class provides methods for setting and getting the Rainbow-parameters
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java
index 5a101994..8c854f5d 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java
@@ -1,8 +1,8 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
-import org.bouncycastle.pqc.crypto.rainbow.Layer;
+import org.spongycastle.pqc.crypto.rainbow.Layer;
/**
* This class provides a specification for a RainbowSignature private key.
diff --git a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java
index dbcf3e75..ce79e9ab 100644
--- a/prov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java
+++ b/prov/src/main/java/org/spongycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.pqc.jcajce.spec;
+package org.spongycastle.pqc.jcajce.spec;
import java.security.spec.KeySpec;
diff --git a/prov/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java b/prov/src/main/java/org/spongycastle/x509/AttributeCertificateHolder.java
index b00cd1d4..981a7203 100644
--- a/prov/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java
+++ b/prov/src/main/java/org/spongycastle/x509/AttributeCertificateHolder.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -14,21 +14,21 @@ import java.util.List;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.Holder;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.ObjectDigestInfo;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.Holder;
+import org.spongycastle.asn1.x509.IssuerSerial;
+import org.spongycastle.asn1.x509.ObjectDigestInfo;
+import org.spongycastle.jce.PrincipalUtil;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Selector;
/**
* The Holder object.
@@ -45,7 +45,7 @@ import org.bouncycastle.util.Selector;
* -- for example, an executable
* }
* </pre>
- * @deprecated use org.bouncycastle.cert.AttributeCertificateHolder
+ * @deprecated use org.spongycastle.cert.AttributeCertificateHolder
*/
public class AttributeCertificateHolder
implements CertSelector, Selector
@@ -60,7 +60,7 @@ public class AttributeCertificateHolder
public AttributeCertificateHolder(X509Principal issuerName,
BigInteger serialNumber)
{
- holder = new org.bouncycastle.asn1.x509.Holder(new IssuerSerial(
+ holder = new org.spongycastle.asn1.x509.Holder(new IssuerSerial(
GeneralNames.getInstance(new DERSequence(new GeneralName(issuerName))),
new ASN1Integer(serialNumber)));
}
@@ -355,7 +355,7 @@ public class AttributeCertificateHolder
MessageDigest md = null;
try
{
- md = MessageDigest.getInstance(getDigestAlgorithm(), "BC");
+ md = MessageDigest.getInstance(getDigestAlgorithm(), "SC");
}
catch (Exception e)
diff --git a/prov/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java b/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java
index 3a342082..3a96e05b 100644
--- a/prov/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java
+++ b/prov/src/main/java/org/spongycastle/x509/AttributeCertificateIssuer.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.security.Principal;
@@ -10,18 +10,18 @@ import java.util.List;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.V2Form;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AttCertIssuer;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.V2Form;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.util.Selector;
/**
* Carrying class for an attribute certificate issuer.
- * @deprecated use org.bouncycastle.cert.AttributeCertificateIssuer
+ * @deprecated use org.spongycastle.cert.AttributeCertificateIssuer
*/
public class AttributeCertificateIssuer
implements CertSelector, Selector
diff --git a/prov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java b/prov/src/main/java/org/spongycastle/x509/CertPathReviewerException.java
index 173d4789..ddf89748 100644
--- a/prov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
+++ b/prov/src/main/java/org/spongycastle/x509/CertPathReviewerException.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.security.cert.CertPath;
-import org.bouncycastle.i18n.ErrorBundle;
-import org.bouncycastle.i18n.LocalizedException;
+import org.spongycastle.i18n.ErrorBundle;
+import org.spongycastle.i18n.LocalizedException;
public class CertPathReviewerException extends LocalizedException
{
diff --git a/prov/src/main/java/org/bouncycastle/x509/ExtCertificateEncodingException.java b/prov/src/main/java/org/spongycastle/x509/ExtCertificateEncodingException.java
index a26c3103..ec3511a9 100644
--- a/prov/src/main/java/org/bouncycastle/x509/ExtCertificateEncodingException.java
+++ b/prov/src/main/java/org/spongycastle/x509/ExtCertificateEncodingException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.security.cert.CertificateEncodingException;
diff --git a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXBuilderParameters.java b/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java
index 51831d07..5299d5cf 100644
--- a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXBuilderParameters.java
+++ b/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXBuilderParameters.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.util.Selector;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidParameterException;
@@ -16,7 +16,7 @@ import java.util.Set;
* This class contains extended parameters for PKIX certification path builders.
*
* @see java.security.cert.PKIXBuilderParameters
- * @see org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi
+ * @see org.spongycastle.jce.provider.PKIXCertPathBuilderSpi
*/
public class ExtendedPKIXBuilderParameters extends ExtendedPKIXParameters
{
@@ -105,7 +105,7 @@ public class ExtendedPKIXBuilderParameters extends ExtendedPKIXParameters
* @throws InvalidParameterException if <code>maxPathLength</code> is set
* to a value less than -1
*
- * @see org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi
+ * @see org.spongycastle.jce.provider.PKIXCertPathBuilderSpi
* @see #getMaxPathLength
*/
public void setMaxPathLength(int maxPathLength)
@@ -137,7 +137,7 @@ public class ExtendedPKIXBuilderParameters extends ExtendedPKIXParameters
* <code>PKIXBuilderParameters</code>.
*
* @param params Parameters to set.
- * @see org.bouncycastle.x509.ExtendedPKIXParameters#setParams(java.security.cert.PKIXParameters)
+ * @see org.spongycastle.x509.ExtendedPKIXParameters#setParams(java.security.cert.PKIXParameters)
*/
protected void setParams(PKIXParameters params)
{
diff --git a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java b/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXParameters.java
index 63866182..12cef95d 100644
--- a/prov/src/main/java/org/bouncycastle/x509/ExtendedPKIXParameters.java
+++ b/prov/src/main/java/org/spongycastle/x509/ExtendedPKIXParameters.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.Store;
import java.security.InvalidAlgorithmParameterException;
import java.security.cert.CertSelector;
@@ -236,7 +236,7 @@ public class ExtendedPKIXParameters
{
throw new ClassCastException(
"All elements of list must be "
- + "of type org.bouncycastle.util.Store.");
+ + "of type org.spongycastle.util.Store.");
}
}
this.stores = new ArrayList(stores);
diff --git a/prov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java b/prov/src/main/java/org/spongycastle/x509/NoSuchParserException.java
index c25b9dd1..06063302 100644
--- a/prov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java
+++ b/prov/src/main/java/org/spongycastle/x509/NoSuchParserException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
public class NoSuchParserException
extends Exception
diff --git a/prov/src/main/java/org/bouncycastle/x509/NoSuchStoreException.java b/prov/src/main/java/org/spongycastle/x509/NoSuchStoreException.java
index 255c0303..35d499a2 100644
--- a/prov/src/main/java/org/bouncycastle/x509/NoSuchStoreException.java
+++ b/prov/src/main/java/org/spongycastle/x509/NoSuchStoreException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
public class NoSuchStoreException
extends Exception
diff --git a/prov/src/main/java/org/bouncycastle/x509/PKIXAttrCertChecker.java b/prov/src/main/java/org/spongycastle/x509/PKIXAttrCertChecker.java
index 816cdab3..7e4f1cbd 100644
--- a/prov/src/main/java/org/bouncycastle/x509/PKIXAttrCertChecker.java
+++ b/prov/src/main/java/org/spongycastle/x509/PKIXAttrCertChecker.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.security.cert.CertPath;
import java.security.cert.CertPathValidatorException;
diff --git a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/prov/src/main/java/org/spongycastle/x509/PKIXCertPathReviewer.java
index 528fbec4..5e444440 100644
--- a/prov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
+++ b/prov/src/main/java/org/spongycastle/x509/PKIXCertPathReviewer.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -36,47 +36,47 @@ import java.util.Vector;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.AccessDescription;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-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.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.NameConstraints;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.i18n.ErrorBundle;
-import org.bouncycastle.i18n.LocaleString;
-import org.bouncycastle.i18n.filter.TrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedUrlInput;
-import org.bouncycastle.jce.provider.AnnotatedException;
-import org.bouncycastle.jce.provider.CertPathValidatorUtilities;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidator;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidatorException;
-import org.bouncycastle.jce.provider.PKIXPolicyNode;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Enumerated;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.x509.AccessDescription;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+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.DistributionPoint;
+import org.spongycastle.asn1.x509.DistributionPointName;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.GeneralSubtree;
+import org.spongycastle.asn1.x509.IssuingDistributionPoint;
+import org.spongycastle.asn1.x509.NameConstraints;
+import org.spongycastle.asn1.x509.PolicyInformation;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.qualified.Iso4217CurrencyCode;
+import org.spongycastle.asn1.x509.qualified.MonetaryValue;
+import org.spongycastle.asn1.x509.qualified.QCStatement;
+import org.spongycastle.i18n.ErrorBundle;
+import org.spongycastle.i18n.LocaleString;
+import org.spongycastle.i18n.filter.TrustedInput;
+import org.spongycastle.i18n.filter.UntrustedInput;
+import org.spongycastle.i18n.filter.UntrustedUrlInput;
+import org.spongycastle.jce.provider.AnnotatedException;
+import org.spongycastle.jce.provider.CertPathValidatorUtilities;
+import org.spongycastle.jce.provider.PKIXNameConstraintValidator;
+import org.spongycastle.jce.provider.PKIXNameConstraintValidatorException;
+import org.spongycastle.jce.provider.PKIXPolicyNode;
+import org.spongycastle.util.Integers;
+import org.spongycastle.x509.extension.X509ExtensionUtil;
/**
* PKIXCertPathReviewer<br>
@@ -89,7 +89,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities
private static final String CRL_DIST_POINTS = X509Extensions.CRLDistributionPoints.getId();
private static final String AUTH_INFO_ACCESS = X509Extensions.AuthorityInfoAccess.getId();
- private static final String RESOURCE_NAME = "org.bouncycastle.x509.CertPathReviewerMessages";
+ private static final String RESOURCE_NAME = "org.spongycastle.x509.CertPathReviewerMessages";
// input parameters
@@ -2185,7 +2185,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities
{
try
{
- crl.verify(workingPublicKey, "BC");
+ crl.verify(workingPublicKey, "SC");
}
catch (Exception e)
{
@@ -2468,7 +2468,7 @@ public class PKIXCertPathReviewer extends CertPathValidatorUtilities
conn.connect();
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK)
{
- CertificateFactory cf = CertificateFactory.getInstance("X.509","BC");
+ CertificateFactory cf = CertificateFactory.getInstance("X.509","SC");
result = (X509CRL) cf.generateCRL(conn.getInputStream());
}
else
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509Attribute.java b/prov/src/main/java/org/spongycastle/x509/X509Attribute.java
index 95da2925..57a826e5 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509Attribute.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509Attribute.java
@@ -1,13 +1,13 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.x509.Attribute;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1Set;
+import org.spongycastle.asn1.DERSet;
+import org.spongycastle.asn1.x509.Attribute;
/**
* Class for carrying the values in an X.509 Attribute.
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java b/prov/src/main/java/org/spongycastle/x509/X509AttributeCertStoreSelector.java
index bd474fd3..e6017956 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509AttributeCertStoreSelector.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -11,23 +11,23 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-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.asn1.x509.X509Extensions;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.DEROctetString;
+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.asn1.x509.X509Extensions;
+import org.spongycastle.util.Selector;
/**
* This class is an <code>Selector</code> like implementation to select
* attribute certificates from a given set of criteria.
*
- * @see org.bouncycastle.x509.X509AttributeCertificate
- * @see org.bouncycastle.x509.X509Store
- * @deprecated use org.bouncycastle.cert.X509AttributeCertificateSelector and org.bouncycastle.cert.X509AttributeCertificateSelectorBuilder.
+ * @see org.spongycastle.x509.X509AttributeCertificate
+ * @see org.spongycastle.x509.X509Store
+ * @deprecated use org.spongycastle.cert.X509AttributeCertificateSelector and org.spongycastle.cert.X509AttributeCertificateSelectorBuilder.
*/
public class X509AttributeCertStoreSelector
implements Selector
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java b/prov/src/main/java/org/spongycastle/x509/X509AttributeCertificate.java
index d65ec78e..bad47225 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509AttributeCertificate.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509CRLStoreSelector.java b/prov/src/main/java/org/spongycastle/x509/X509CRLStoreSelector.java
index 2486d208..1e849a34 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509CRLStoreSelector.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509CRLStoreSelector.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -6,19 +6,19 @@ import java.security.cert.CRL;
import java.security.cert.X509CRL;
import java.security.cert.X509CRLSelector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Selector;
+import org.spongycastle.x509.extension.X509ExtensionUtil;
/**
* This class is a Selector implementation for X.509 certificate revocation
* lists.
*
- * @see org.bouncycastle.util.Selector
- * @see org.bouncycastle.x509.X509Store
- * @see org.bouncycastle.jce.provider.X509StoreCRLCollection
+ * @see org.spongycastle.util.Selector
+ * @see org.spongycastle.x509.X509Store
+ * @see org.spongycastle.jce.provider.X509StoreCRLCollection
*/
public class X509CRLStoreSelector
extends X509CRLSelector
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java b/prov/src/main/java/org/spongycastle/x509/X509CertPairStoreSelector.java
index 187b0983..e5676bcb 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509CertPairStoreSelector.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.util.Selector;
/**
* This class is an <code>Selector</code> like implementation to select
* certificates pairs, which are e.g. used for cross certificates. The set of
* criteria is given from two
- * {@link org.bouncycastle.x509.X509CertStoreSelector}s which must be both
+ * {@link org.spongycastle.x509.X509CertStoreSelector}s which must be both
* matched.
*
- * @see org.bouncycastle.x509.X509AttributeCertificate
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509AttributeCertificate
+ * @see org.spongycastle.x509.X509Store
*/
public class X509CertPairStoreSelector implements Selector
{
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509CertStoreSelector.java b/prov/src/main/java/org/spongycastle/x509/X509CertStoreSelector.java
index 65353285..d78e57f1 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509CertStoreSelector.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509CertStoreSelector.java
@@ -1,19 +1,19 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.security.cert.Certificate;
import java.security.cert.X509CertSelector;
import java.security.cert.X509Certificate;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.util.Selector;
/**
* This class is a Selector implementation for X.509 certificates.
*
- * @see org.bouncycastle.util.Selector
- * @see org.bouncycastle.x509.X509Store
- * @see org.bouncycastle.jce.provider.X509StoreCertCollection
- * @deprecated use the classes under org.bouncycastle.cert.selector
+ * @see org.spongycastle.util.Selector
+ * @see org.spongycastle.x509.X509Store
+ * @see org.spongycastle.jce.provider.X509StoreCertCollection
+ * @deprecated use the classes under org.spongycastle.cert.selector
*/
public class X509CertStoreSelector
extends X509CertSelector
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java b/prov/src/main/java/org/spongycastle/x509/X509CertificatePair.java
index 73e5ba31..39c0b407 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509CertificatePair.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.provider.X509CertificateObject;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.CertificatePair;
+import org.spongycastle.jce.provider.X509CertificateObject;
/**
* This class contains a cross certificate pair. Cross certificates pairs may
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509CollectionStoreParameters.java b/prov/src/main/java/org/spongycastle/x509/X509CollectionStoreParameters.java
index 16420fed..eb388771 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509CollectionStoreParameters.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509CollectionStoreParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.util.ArrayList;
import java.util.Collection;
@@ -6,7 +6,7 @@ import java.util.Collection;
/**
* This class contains a collection for collection based <code>X509Store</code>s.
*
- * @see org.bouncycastle.x509.X509Store
+ * @see org.spongycastle.x509.X509Store
*
*/
public class X509CollectionStoreParameters
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509Store.java b/prov/src/main/java/org/spongycastle/x509/X509Store.java
index 61d921c5..94e82558 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509Store.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509Store.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Provider;
import java.util.Collection;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
+import org.spongycastle.util.Selector;
+import org.spongycastle.util.Store;
/**
* @deprecated use CollectionStore - this class will be removed.
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509StoreParameters.java b/prov/src/main/java/org/spongycastle/x509/X509StoreParameters.java
index 22548da4..38a65abb 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509StoreParameters.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509StoreParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
public interface X509StoreParameters
{
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509StoreSpi.java b/prov/src/main/java/org/spongycastle/x509/X509StoreSpi.java
index 3455add9..74d1d4d3 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509StoreSpi.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509StoreSpi.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.util.Selector;
+import org.spongycastle.util.Selector;
import java.util.Collection;
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509StreamParser.java b/prov/src/main/java/org/spongycastle/x509/X509StreamParser.java
index 3ad28468..3aebe07c 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509StreamParser.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509StreamParser.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.x509.util.StreamParser;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.x509.util.StreamParser;
+import org.spongycastle.x509.util.StreamParsingException;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -22,7 +22,7 @@ import java.util.Collection;
* <code>algorithm</code> parameter to the <code>getInstance</code> methods.
* <p>
* Implementations must implement the
- * {@link org.bouncycastle.x509.X509StreamParserSpi}.
+ * {@link org.spongycastle.x509.X509StreamParserSpi}.
*/
public class X509StreamParser
implements StreamParser
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java b/prov/src/main/java/org/spongycastle/x509/X509StreamParserSpi.java
index 6929eb12..814a65f9 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509StreamParserSpi.java
@@ -1,6 +1,6 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
-import org.bouncycastle.x509.util.StreamParsingException;
+import org.spongycastle.x509.util.StreamParsingException;
import java.io.InputStream;
import java.util.Collection;
@@ -9,7 +9,7 @@ import java.util.Collection;
* This abstract class defines the service provider interface (SPI) for
* X509StreamParser.
*
- * @see org.bouncycastle.x509.X509StreamParser
+ * @see org.spongycastle.x509.X509StreamParser
*
*/
public abstract class X509StreamParserSpi
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509Util.java b/prov/src/main/java/org/spongycastle/x509/X509Util.java
index d002111e..c734942d 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509Util.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509Util.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -20,21 +20,21 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.oiw.OIWObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.RSASSAPSSparams;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x9.X9ObjectIdentifiers;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.util.Strings;
class X509Util
{
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java b/prov/src/main/java/org/spongycastle/x509/X509V1CertificateGenerator.java
index f7ff3e43..398d77f4 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509V1CertificateGenerator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -19,26 +19,26 @@ import java.util.Iterator;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V1TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.X509CertificateObject;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.TBSCertificate;
+import org.spongycastle.asn1.x509.Time;
+import org.spongycastle.asn1.x509.V1TBSCertificateGenerator;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.provider.X509CertificateObject;
/**
* class to produce an X.509 Version 1 certificate.
- * @deprecated use org.bouncycastle.cert.X509v1CertificateBuilder.
+ * @deprecated use org.spongycastle.cert.X509v1CertificateBuilder.
*/
public class X509V1CertificateGenerator
{
@@ -179,8 +179,8 @@ public class X509V1CertificateGenerator
/**
* generate an X509 certificate, based on the current issuer and subject
- * using the default provider "BC".
- * @deprecated use generate(key, "BC")
+ * using the default provider "SC".
+ * @deprecated use generate(key, "SC")
*/
public X509Certificate generateX509Certificate(
PrivateKey key)
@@ -188,7 +188,7 @@ public class X509V1CertificateGenerator
{
try
{
- return generateX509Certificate(key, "BC", null);
+ return generateX509Certificate(key, "SC", null);
}
catch (NoSuchProviderException e)
{
@@ -198,8 +198,8 @@ public class X509V1CertificateGenerator
/**
* generate an X509 certificate, based on the current issuer and subject
- * using the default provider "BC" and the passed in source of randomness
- * @deprecated use generate(key, random, "BC")
+ * using the default provider "SC" and the passed in source of randomness
+ * @deprecated use generate(key, random, "SC")
*/
public X509Certificate generateX509Certificate(
PrivateKey key,
@@ -208,7 +208,7 @@ public class X509V1CertificateGenerator
{
try
{
- return generateX509Certificate(key, "BC", random);
+ return generateX509Certificate(key, "SC", random);
}
catch (NoSuchProviderException e)
{
@@ -269,7 +269,7 @@ public class X509V1CertificateGenerator
* using the default provider.
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509Certificate generate(
@@ -284,7 +284,7 @@ public class X509V1CertificateGenerator
* using the default provider and the passed in source of randomness
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509Certificate generate(
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java b/prov/src/main/java/org/spongycastle/x509/X509V2AttributeCertificate.java
index 14db8eab..c0d893df 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509V2AttributeCertificate.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -21,20 +21,20 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.x509.AttributeCertificate;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.util.Arrays;
/**
* An implementation of a version 2 X.509 Attribute Certificate.
- * @deprecated use org.bouncycastle.cert.X509AttributeCertificateHolder
+ * @deprecated use org.spongycastle.cert.X509AttributeCertificateHolder
*/
public class X509V2AttributeCertificate
implements X509AttributeCertificate
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java b/prov/src/main/java/org/spongycastle/x509/X509V2CRLGenerator.java
index 8773d0ec..457883e6 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509V2CRLGenerator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -18,30 +18,30 @@ import java.util.Set;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V2TBSCertListGenerator;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.X509CRLObject;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.CertificateList;
+import org.spongycastle.asn1.x509.Extensions;
+import org.spongycastle.asn1.x509.TBSCertList;
+import org.spongycastle.asn1.x509.Time;
+import org.spongycastle.asn1.x509.V2TBSCertListGenerator;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509ExtensionsGenerator;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.provider.X509CRLObject;
/**
* class to produce an X.509 Version 2 CRL.
- * @deprecated use org.bouncycastle.cert.X509v2CRLBuilder.
+ * @deprecated use org.spongycastle.cert.X509v2CRLBuilder.
*/
public class X509V2CRLGenerator
{
@@ -234,8 +234,8 @@ public class X509V2CRLGenerator
/**
* generate an X509 CRL, based on the current issuer and subject
- * using the default provider "BC".
- * @deprecated use generate(key, "BC")
+ * using the default provider "SC".
+ * @deprecated use generate(key, "SC")
*/
public X509CRL generateX509CRL(
PrivateKey key)
@@ -243,7 +243,7 @@ public class X509V2CRLGenerator
{
try
{
- return generateX509CRL(key, "BC", null);
+ return generateX509CRL(key, "SC", null);
}
catch (NoSuchProviderException e)
{
@@ -253,9 +253,9 @@ public class X509V2CRLGenerator
/**
* generate an X509 CRL, based on the current issuer and subject
- * using the default provider "BC" and an user defined SecureRandom object as
+ * using the default provider "SC" and an user defined SecureRandom object as
* source of randomness.
- * @deprecated use generate(key, random, "BC")
+ * @deprecated use generate(key, random, "SC")
*/
public X509CRL generateX509CRL(
PrivateKey key,
@@ -264,7 +264,7 @@ public class X509V2CRLGenerator
{
try
{
- return generateX509CRL(key, "BC", random);
+ return generateX509CRL(key, "SC", random);
}
catch (NoSuchProviderException e)
{
@@ -323,7 +323,7 @@ public class X509V2CRLGenerator
* using the default provider.
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509CRL generate(
@@ -339,7 +339,7 @@ public class X509V2CRLGenerator
* source of randomness.
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509CRL generate(
diff --git a/prov/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java b/prov/src/main/java/org/spongycastle/x509/X509V3CertificateGenerator.java
index c422cb26..5f5cae94 100644
--- a/prov/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java
+++ b/prov/src/main/java/org/spongycastle/x509/X509V3CertificateGenerator.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509;
+package org.spongycastle.x509;
import java.io.IOException;
import java.math.BigInteger;
@@ -18,28 +18,28 @@ import java.util.Iterator;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.X509ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.X509CertificateObject;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1EncodableVector;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERBitString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.TBSCertificate;
+import org.spongycastle.asn1.x509.Time;
+import org.spongycastle.asn1.x509.V3TBSCertificateGenerator;
+import org.spongycastle.asn1.x509.X509ExtensionsGenerator;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.X509Principal;
+import org.spongycastle.jce.provider.X509CertificateObject;
+import org.spongycastle.x509.extension.X509ExtensionUtil;
/**
* class to produce an X.509 Version 3 certificate.
- * @deprecated use org.bouncycastle.cert.X509v3CertificateBuilder.
+ * @deprecated use org.spongycastle.cert.X509v3CertificateBuilder.
*/
public class X509V3CertificateGenerator
{
@@ -311,8 +311,8 @@ public class X509V3CertificateGenerator
/**
* generate an X509 certificate, based on the current issuer and subject
- * using the default provider "BC".
- * @deprecated use generate(key, "BC")
+ * using the default provider "SC".
+ * @deprecated use generate(key, "SC")
*/
public X509Certificate generateX509Certificate(
PrivateKey key)
@@ -320,7 +320,7 @@ public class X509V3CertificateGenerator
{
try
{
- return generateX509Certificate(key, "BC", null);
+ return generateX509Certificate(key, "SC", null);
}
catch (NoSuchProviderException e)
{
@@ -330,9 +330,9 @@ public class X509V3CertificateGenerator
/**
* generate an X509 certificate, based on the current issuer and subject
- * using the default provider "BC", and the passed in source of randomness
+ * using the default provider "SC", and the passed in source of randomness
* (if required).
- * @deprecated use generate(key, random, "BC")
+ * @deprecated use generate(key, random, "SC")
*/
public X509Certificate generateX509Certificate(
PrivateKey key,
@@ -341,7 +341,7 @@ public class X509V3CertificateGenerator
{
try
{
- return generateX509Certificate(key, "BC", random);
+ return generateX509Certificate(key, "SC", random);
}
catch (NoSuchProviderException e)
{
@@ -401,7 +401,7 @@ public class X509V3CertificateGenerator
* using the default provider.
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509Certificate generate(
@@ -417,7 +417,7 @@ public class X509V3CertificateGenerator
* (if required).
* <p>
* <b>Note:</b> this differs from the deprecated method in that the default provider is
- * used - not "BC".
+ * used - not "SC".
* </p>
*/
public X509Certificate generate(
diff --git a/prov/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java b/prov/src/main/java/org/spongycastle/x509/extension/AuthorityKeyIdentifierStructure.java
index 2164d1fb..bb138022 100644
--- a/prov/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java
+++ b/prov/src/main/java/org/spongycastle/x509/extension/AuthorityKeyIdentifierStructure.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509.extension;
+package org.spongycastle.x509.extension;
import java.io.IOException;
import java.security.InvalidKeyException;
@@ -6,17 +6,17 @@ import java.security.PublicKey;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jce.PrincipalUtil;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.x509.AuthorityKeyIdentifier;
+import org.spongycastle.asn1.x509.Extension;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.GeneralNames;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.jce.PrincipalUtil;
/**
* A high level authority key identifier.
diff --git a/prov/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java b/prov/src/main/java/org/spongycastle/x509/extension/X509ExtensionUtil.java
index 2e4d14d3..4a6a93d6 100644
--- a/prov/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java
+++ b/prov/src/main/java/org/spongycastle/x509/extension/X509ExtensionUtil.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509.extension;
+package org.spongycastle.x509.extension;
import java.io.IOException;
import java.security.cert.CertificateParsingException;
@@ -9,16 +9,16 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Primitive;
+import org.spongycastle.asn1.ASN1String;
+import org.spongycastle.asn1.DEROctetString;
+import org.spongycastle.asn1.DERSequence;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x509.GeneralName;
+import org.spongycastle.asn1.x509.X509Extension;
+import org.spongycastle.util.Integers;
public class X509ExtensionUtil
diff --git a/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java b/prov/src/main/java/org/spongycastle/x509/util/LDAPStoreHelper.java
index 13b39423..6692c27e 100644
--- a/prov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java
+++ b/prov/src/main/java/org/spongycastle/x509/util/LDAPStoreHelper.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509.util;
+package org.spongycastle.x509.util;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -27,31 +27,31 @@ import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import javax.security.auth.x500.X500Principal;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.jce.provider.X509AttrCertParser;
-import org.bouncycastle.jce.provider.X509CRLParser;
-import org.bouncycastle.jce.provider.X509CertPairParser;
-import org.bouncycastle.jce.provider.X509CertParser;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509CertificatePair;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.x509.Certificate;
+import org.spongycastle.asn1.x509.CertificatePair;
+import org.spongycastle.jce.X509LDAPCertStoreParameters;
+import org.spongycastle.jce.provider.X509AttrCertParser;
+import org.spongycastle.jce.provider.X509CRLParser;
+import org.spongycastle.jce.provider.X509CertPairParser;
+import org.spongycastle.jce.provider.X509CertParser;
+import org.spongycastle.util.StoreException;
+import org.spongycastle.x509.X509AttributeCertStoreSelector;
+import org.spongycastle.x509.X509AttributeCertificate;
+import org.spongycastle.x509.X509CRLStoreSelector;
+import org.spongycastle.x509.X509CertPairStoreSelector;
+import org.spongycastle.x509.X509CertStoreSelector;
+import org.spongycastle.x509.X509CertificatePair;
/**
* This is a general purpose implementation to get X.509 certificates, CRLs,
* attribute certificates and cross certificates from a LDAP location.
* <p/>
* At first a search is performed in the ldap*AttributeNames of the
- * {@link org.bouncycastle.jce.X509LDAPCertStoreParameters} with the given
+ * {@link org.spongycastle.jce.X509LDAPCertStoreParameters} with the given
* information of the subject (for all kind of certificates) or issuer (for
- * CRLs), respectively, if a {@link org.bouncycastle.x509.X509CertStoreSelector} or
- * {@link org.bouncycastle.x509.X509AttributeCertificate} is given with that
+ * CRLs), respectively, if a {@link org.spongycastle.x509.X509CertStoreSelector} or
+ * {@link org.spongycastle.x509.X509AttributeCertificate} is given with that
* details.
* <p/>
* For the used schemes see:
@@ -249,7 +249,7 @@ public class LDAPStoreHelper
/**
* Can use the subject of the forward certificate of the set certificate
* pair or the subject of the forward
- * {@link org.bouncycastle.x509.X509CertStoreSelector} of the given
+ * {@link org.spongycastle.x509.X509CertStoreSelector} of the given
* selector.
*
* @param xselector The selector with the search criteria.
diff --git a/prov/src/main/java/org/bouncycastle/x509/util/StreamParser.java b/prov/src/main/java/org/spongycastle/x509/util/StreamParser.java
index 26048946..f0db6643 100644
--- a/prov/src/main/java/org/bouncycastle/x509/util/StreamParser.java
+++ b/prov/src/main/java/org/spongycastle/x509/util/StreamParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509.util;
+package org.spongycastle.x509.util;
import java.util.Collection;
diff --git a/prov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java b/prov/src/main/java/org/spongycastle/x509/util/StreamParsingException.java
index 8f69ff6c..6d005e92 100644
--- a/prov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java
+++ b/prov/src/main/java/org/spongycastle/x509/util/StreamParsingException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.x509.util;
+package org.spongycastle.x509.util;
public class StreamParsingException
extends Exception