bouncycastle 1.48 upgrade

Change-Id: Idb04baf42de07b18ddb162e5cd1f98cdadf366f4

1 files changed, 52 insertions, 11 deletions

diff --git a/bouncycastle.config b/bouncycastle.config
index c31204f6..3ebc43c2 100644
--- a/bouncycastle.config
+++ b/bouncycastle.config
@@ -16,6 +16,7 @@ org/bouncycastle/asn1/tsp \
 org/bouncycastle/asn1/x509/qualified \
 org/bouncycastle/asn1/x509/sigi \
 org/bouncycastle/crypto/agreement/kdf \
+org/bouncycastle/crypto/agreement/jpake \
 org/bouncycastle/crypto/agreement/srp \
 org/bouncycastle/crypto/examples \
 org/bouncycastle/crypto/prng \
@@ -23,11 +24,13 @@ org/bouncycastle/crypto/tls/ \
 org/bouncycastle/i18n/ \
 org/bouncycastle/jcajce/provider/asymmetric/ecgost \
 org/bouncycastle/jcajce/provider/asymmetric/elgamal \
+org/bouncycastle/jcajce/provider/asymmetric/dstu \
 org/bouncycastle/jcajce/provider/asymmetric/gost \
 org/bouncycastle/jce/examples \
 org/bouncycastle/jce/provider/test \
 org/bouncycastle/math/ntru \
 org/bouncycastle/ocsp \
+org/bouncycastle/pqc \
 org/bouncycastle/util/test \
 org/bouncycastle/x509/examples \
 "
@@ -45,6 +48,7 @@ org/bouncycastle/asn1/cms/AuthenticatedDataParser.java \
 org/bouncycastle/asn1/cms/CompressedData.java \
 org/bouncycastle/asn1/cms/CompressedDataParser.java \
 org/bouncycastle/asn1/cms/ContentInfoParser.java \
+org/bouncycastle/asn1/cms/DigestedData.java \
 org/bouncycastle/asn1/cms/EncryptedContentInfo.java \
 org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java \
 org/bouncycastle/asn1/cms/EncryptedData.java \
@@ -73,20 +77,20 @@ org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java \
 org/bouncycastle/asn1/cms/TimeStampedData.java \
 org/bouncycastle/asn1/cms/TimeStampedDataParser.java \
 org/bouncycastle/asn1/cms/package.html \
-org/bouncycastle/asn1/eac/CertificationAuthorityReference.java \
-org/bouncycastle/asn1/eac/Flags.java \
 org/bouncycastle/asn1/eac/BidirectionalMap.java \
-org/bouncycastle/asn1/eac/CertificateBody.java \
-org/bouncycastle/asn1/eac/UnsignedInteger.java \
 org/bouncycastle/asn1/eac/CVCertificate.java \
+org/bouncycastle/asn1/eac/CVCertificateRequest.java \
+org/bouncycastle/asn1/eac/CertificateBody.java \
 org/bouncycastle/asn1/eac/CertificateHolderAuthorization.java \
-org/bouncycastle/asn1/eac/PublicKeyDataObject.java \
-org/bouncycastle/asn1/eac/ECDSAPublicKey.java \
 org/bouncycastle/asn1/eac/CertificateHolderReference.java \
-org/bouncycastle/asn1/eac/CVCertificateRequest.java \
-org/bouncycastle/asn1/eac/RSAPublicKey.java \
+org/bouncycastle/asn1/eac/CertificationAuthorityReference.java \
 org/bouncycastle/asn1/eac/EACTags.java \
+org/bouncycastle/asn1/eac/ECDSAPublicKey.java \
+org/bouncycastle/asn1/eac/Flags.java \
 org/bouncycastle/asn1/eac/PackedDate.java \
+org/bouncycastle/asn1/eac/PublicKeyDataObject.java \
+org/bouncycastle/asn1/eac/RSAPublicKey.java \
+org/bouncycastle/asn1/eac/UnsignedInteger.java \
 org/bouncycastle/asn1/isismtt/ocsp/CertHash.java \
 org/bouncycastle/asn1/isismtt/ocsp/RequestedCertificate.java \
 org/bouncycastle/asn1/isismtt/x509/AdditionalInformationSyntax.java \
@@ -112,6 +116,13 @@ org/bouncycastle/asn1/pkcs/package.html \
 org/bouncycastle/asn1/sec/package.html \
 org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java \
 org/bouncycastle/asn1/teletrust/package.html \
+org/bouncycastle/asn1/ua/DSTU4145BinaryField.java \
+org/bouncycastle/asn1/ua/DSTU4145ECBinary.java \
+org/bouncycastle/asn1/ua/DSTU4145NamedCurves.java \
+org/bouncycastle/asn1/ua/DSTU4145Params.java \
+org/bouncycastle/asn1/ua/DSTU4145PointEncoder.java \
+org/bouncycastle/asn1/ua/DSTU4145PublicKey.java \
+org/bouncycastle/asn1/ua/UAObjectIdentifiers.java \
 org/bouncycastle/asn1/util/DERDump.java \
 org/bouncycastle/asn1/util/Dump.java \
 org/bouncycastle/asn1/util/package.html \
@@ -141,6 +152,9 @@ org/bouncycastle/asn1/x9/KeySpecificInfo.java \
 org/bouncycastle/asn1/x9/OtherInfo.java \
 org/bouncycastle/asn1/x9/package.html \
 org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java \
+org/bouncycastle/crypto/EphemeralKeyPair.java \
+org/bouncycastle/crypto/KeyEncoder.java \
+org/bouncycastle/crypto/KeyParser.java \
 org/bouncycastle/crypto/MaxBytesExceededException.java \
 org/bouncycastle/crypto/agreement/DHAgreement.java \
 org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java \
@@ -154,6 +168,7 @@ org/bouncycastle/crypto/digests/RIPEMD160Digest.java \
 org/bouncycastle/crypto/digests/RIPEMD256Digest.java \
 org/bouncycastle/crypto/digests/RIPEMD320Digest.java \
 org/bouncycastle/crypto/digests/SHA224Digest.java \
+org/bouncycastle/crypto/digests/SHA3Digest.java \
 org/bouncycastle/crypto/digests/ShortenedDigest.java \
 org/bouncycastle/crypto/digests/TigerDigest.java \
 org/bouncycastle/crypto/digests/WhirlpoolDigest.java \
@@ -200,10 +215,13 @@ org/bouncycastle/crypto/engines/XTEAEngine.java \
 org/bouncycastle/crypto/engines/package.html \
 org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java \
 org/bouncycastle/crypto/generators/DHKeyPairGenerator.java \
+org/bouncycastle/crypto/generators/DSTU4145KeyPairGenerator.java \
 org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java \
 org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java \
+org/bouncycastle/crypto/generators/EphemeralKeyPairGenerator.java \
 org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java \
 org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java \
+org/bouncycastle/crypto/generators/HKDFBytesGenerator.java \
 org/bouncycastle/crypto/generators/KDF1BytesGenerator.java \
 org/bouncycastle/crypto/generators/KDF2BytesGenerator.java \
 org/bouncycastle/crypto/generators/MGF1BytesGenerator.java \
@@ -231,8 +249,6 @@ org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java \
 org/bouncycastle/crypto/modes/PaddedBlockCipher.java \
 org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java \
 org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java \
-org/bouncycastle/crypto/modes/gcm/GCMExponentiator.java \
-org/bouncycastle/crypto/modes/gcm/Tables1kGCMExponentiator.java \
 org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java \
 org/bouncycastle/crypto/modes/package.html \
 org/bouncycastle/crypto/package.html \
@@ -249,6 +265,7 @@ org/bouncycastle/crypto/params/GOST3410Parameters.java \
 org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java \
 org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java \
 org/bouncycastle/crypto/params/GOST3410ValidationParameters.java \
+org/bouncycastle/crypto/params/HKDFParameters.java \
 org/bouncycastle/crypto/params/IESParameters.java \
 org/bouncycastle/crypto/params/IESWithCipherParameters.java \
 org/bouncycastle/crypto/params/ISO18033KDFParameters.java \
@@ -274,7 +291,10 @@ org/bouncycastle/crypto/params/ParametersWithSalt.java \
 org/bouncycastle/crypto/params/RC5Parameters.java \
 org/bouncycastle/crypto/params/RSABlindingParameters.java \
 org/bouncycastle/crypto/params/package.html \
+org/bouncycastle/crypto/parsers/DHIESPublicKeyParser.java \
+org/bouncycastle/crypto/parsers/ECIESPublicKeyParser.java \
 org/bouncycastle/crypto/signers/DSADigestSigner.java \
+org/bouncycastle/crypto/signers/DSTU4145Signer.java \
 org/bouncycastle/crypto/signers/ECGOST3410Signer.java \
 org/bouncycastle/crypto/signers/ECNRSigner.java \
 org/bouncycastle/crypto/signers/GOST3410Signer.java \
@@ -285,12 +305,18 @@ org/bouncycastle/crypto/signers/NTRUSigner.java \
 org/bouncycastle/crypto/signers/NTRUSignerPrng.java \
 org/bouncycastle/crypto/signers/PSSSigner.java \
 org/bouncycastle/crypto/signers/package.html \
+org/bouncycastle/crypto/util/PrivateKeyInfoFactory.java \
+org/bouncycastle/crypto/util/SubjectPublicKeyInfoFactory.java \
 org/bouncycastle/crypto/util/package.html \
+org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java \
 org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java \
 org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java \
 org/bouncycastle/jcajce/provider/asymmetric/GOST.java \
+org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java \
+org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java \
 org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java \
 org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java \
+org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java \
 org/bouncycastle/jcajce/provider/digest/GOST3411.java \
 org/bouncycastle/jcajce/provider/digest/MD2.java \
 org/bouncycastle/jcajce/provider/digest/MD4.java \
@@ -299,6 +325,7 @@ org/bouncycastle/jcajce/provider/digest/RIPEMD160.java \
 org/bouncycastle/jcajce/provider/digest/RIPEMD256.java \
 org/bouncycastle/jcajce/provider/digest/RIPEMD320.java \
 org/bouncycastle/jcajce/provider/digest/SHA224.java \
+org/bouncycastle/jcajce/provider/digest/SHA3.java \
 org/bouncycastle/jcajce/provider/digest/Tiger.java \
 org/bouncycastle/jcajce/provider/digest/Whirlpool.java \
 org/bouncycastle/jcajce/provider/symmetric/CAST5.java \
@@ -417,6 +444,7 @@ org/bouncycastle/x509/util/StreamParsingException.java \
 # directories
 UNNEEDED_BCPKIX_SOURCES=" \
 docs \
+org/bouncycastle/cert/bc \
 org/bouncycastle/cert/cmp \
 org/bouncycastle/cert/crmf \
 org/bouncycastle/cert/ocsp \
@@ -475,6 +503,7 @@ org/bouncycastle/cms/CMSCompressedDataParser.java \
 org/bouncycastle/cms/CMSCompressedDataStreamGenerator.java \
 org/bouncycastle/cms/CMSConfig.java \
 org/bouncycastle/cms/CMSContentInfoParser.java \
+org/bouncycastle/cms/CMSDigestedData.java \
 org/bouncycastle/cms/CMSEncryptedData.java \
 org/bouncycastle/cms/CMSEncryptedDataGenerator.java \
 org/bouncycastle/cms/CMSEncryptedGenerator.java \
@@ -569,16 +598,28 @@ org/bouncycastle/operator/OutputCompressor.java \
 org/bouncycastle/operator/OutputEncryptor.java \
 org/bouncycastle/operator/SymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/SymmetricKeyWrapper.java \
+org/bouncycastle/operator/bc/AESUtil.java \
+org/bouncycastle/operator/bc/BcAESSymmetricKeyUnwrapper.java \
+org/bouncycastle/operator/bc/BcAESSymmetricKeyWrapper.java \
+org/bouncycastle/operator/bc/BcAsymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/bc/BcAsymmetricKeyWrapper.java \
 org/bouncycastle/operator/bc/BcContentSignerBuilder.java \
 org/bouncycastle/operator/bc/BcContentVerifierProviderBuilder.java \
+org/bouncycastle/operator/bc/BcDSAContentSignerBuilder.java \
+org/bouncycastle/operator/bc/BcDSAContentVerifierProviderBuilder.java \
+org/bouncycastle/operator/bc/BcRSAAsymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/bc/BcRSAAsymmetricKeyWrapper.java \
 org/bouncycastle/operator/bc/BcRSAContentSignerBuilder.java \
 org/bouncycastle/operator/bc/BcRSAContentVerifierProviderBuilder.java \
 org/bouncycastle/operator/bc/BcSignerOutputStream.java \
+org/bouncycastle/operator/bc/BcSymmetricKeyUnwrapper.java \
+org/bouncycastle/operator/bc/BcSymmetricKeyWrapper.java \
+org/bouncycastle/operator/bc/CamelliaUtil.java \
 org/bouncycastle/operator/bc/OperatorUtils.java \
+org/bouncycastle/operator/bc/SEEDUtil.java \
 org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java \
+org/bouncycastle/operator/jcajce/JceGenericKey.java \
 org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java \
 org/bouncycastle/operator/jcajce/OperatorUtils.java \
@@ -592,5 +633,5 @@ NEEDED_BCPROV_SOURCES="org"
 NEEDED_BCPKIX_SOURCES="org"
 
 # list of patch files to apply in the given order
-BOUNCYCASTLE_BCPROV_PATCHES="patches/bcprov.patch patches/CipherSpi-engineWrap.patch"
+BOUNCYCASTLE_BCPROV_PATCHES="patches/bcprov.patch"
 BOUNCYCASTLE_BCPKIX_PATCHES="patches/bcpkix.patch"