bouncycastle 1.49 upgrade

Change-Id: Icbf5a147409c810060a5acc884834fb2a778e860

1 files changed, 30 insertions, 22 deletions

diff --git a/bouncycastle.config b/bouncycastle.config
index 3ebc43c2..338b5724 100644
--- a/bouncycastle.config
+++ b/bouncycastle.config
@@ -4,6 +4,7 @@ org/bouncycastle/asn1/cmp \
 org/bouncycastle/asn1/cms/ecc \
 org/bouncycastle/asn1/crmf \
 org/bouncycastle/asn1/cryptopro \
+org/bouncycastle/asn1/dvcs \
 org/bouncycastle/asn1/esf \
 org/bouncycastle/asn1/ess \
 org/bouncycastle/asn1/gnu \
@@ -18,7 +19,10 @@ org/bouncycastle/asn1/x509/sigi \
 org/bouncycastle/crypto/agreement/kdf \
 org/bouncycastle/crypto/agreement/jpake \
 org/bouncycastle/crypto/agreement/srp \
+org/bouncycastle/crypto/commitments \
+org/bouncycastle/crypto/ec \
 org/bouncycastle/crypto/examples \
+org/bouncycastle/crypto/kems \
 org/bouncycastle/crypto/prng \
 org/bouncycastle/crypto/tls/ \
 org/bouncycastle/i18n/ \
@@ -26,9 +30,9 @@ 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/jcajce/provider/asymmetric/ies \
 org/bouncycastle/jce/examples \
 org/bouncycastle/jce/provider/test \
-org/bouncycastle/math/ntru \
 org/bouncycastle/ocsp \
 org/bouncycastle/pqc \
 org/bouncycastle/util/test \
@@ -41,6 +45,7 @@ org/bouncycastle/LICENSE.java \
 org/bouncycastle/asn1/BERSequenceGenerator.java \
 org/bouncycastle/asn1/DERGenerator.java \
 org/bouncycastle/asn1/DERSequenceGenerator.java \
+org/bouncycastle/asn1/DERT61UTF8String.java \
 org/bouncycastle/asn1/cms/AuthEnvelopedData.java \
 org/bouncycastle/asn1/cms/AuthEnvelopedDataParser.java \
 org/bouncycastle/asn1/cms/AuthenticatedData.java \
@@ -66,11 +71,13 @@ org/bouncycastle/asn1/cms/OriginatorInfo.java \
 org/bouncycastle/asn1/cms/OriginatorPublicKey.java \
 org/bouncycastle/asn1/cms/OtherKeyAttribute.java \
 org/bouncycastle/asn1/cms/OtherRecipientInfo.java \
+org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java \
 org/bouncycastle/asn1/cms/PasswordRecipientInfo.java \
 org/bouncycastle/asn1/cms/RecipientEncryptedKey.java \
 org/bouncycastle/asn1/cms/RecipientIdentifier.java \
 org/bouncycastle/asn1/cms/RecipientInfo.java \
 org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java \
+org/bouncycastle/asn1/cms/SCVPReqRes.java \
 org/bouncycastle/asn1/cms/SignedDataParser.java \
 org/bouncycastle/asn1/cms/TimeStampAndCRL.java \
 org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java \
@@ -132,6 +139,7 @@ org/bouncycastle/asn1/x509/CertPolicyId.java \
 org/bouncycastle/asn1/x509/CertificatePair.java \
 org/bouncycastle/asn1/x509/CertificatePolicies.java \
 org/bouncycastle/asn1/x509/DisplayText.java \
+org/bouncycastle/asn1/x509/GeneralNamesBuilder.java \
 org/bouncycastle/asn1/x509/IetfAttrSyntax.java \
 org/bouncycastle/asn1/x509/NoticeReference.java \
 org/bouncycastle/asn1/x509/PolicyMappings.java \
@@ -148,27 +156,34 @@ org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java \
 org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java \
 org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java \
 org/bouncycastle/asn1/x509/package.html \
+org/bouncycastle/asn1/x9/ECNamedCurveTable.java \
 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/Commitment.java \
+org/bouncycastle/crypto/Committer.java \
 org/bouncycastle/crypto/EphemeralKeyPair.java \
+org/bouncycastle/crypto/KeyEncapsulation.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/DHStandardGroups.java \
 org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java \
 org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java \
 org/bouncycastle/crypto/agreement/package.html \
 org/bouncycastle/crypto/digests/GOST3411Digest.java \
 org/bouncycastle/crypto/digests/MD2Digest.java \
 org/bouncycastle/crypto/digests/MD4Digest.java \
+org/bouncycastle/crypto/digests/NonMemoableDigest.java \
 org/bouncycastle/crypto/digests/RIPEMD128Digest.java \
 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/SHA512tDigest.java \
 org/bouncycastle/crypto/digests/ShortenedDigest.java \
 org/bouncycastle/crypto/digests/TigerDigest.java \
 org/bouncycastle/crypto/digests/WhirlpoolDigest.java \
@@ -190,8 +205,6 @@ org/bouncycastle/crypto/engines/HC256Engine.java \
 org/bouncycastle/crypto/engines/IDEAEngine.java \
 org/bouncycastle/crypto/engines/IESEngine.java \
 org/bouncycastle/crypto/engines/ISAACEngine.java \
-org/bouncycastle/crypto/engines/IndexGenerator.java \
-org/bouncycastle/crypto/engines/NTRUEngine.java \
 org/bouncycastle/crypto/engines/NaccacheSternEngine.java \
 org/bouncycastle/crypto/engines/NoekeonEngine.java \
 org/bouncycastle/crypto/engines/NullEngine.java \
@@ -225,8 +238,6 @@ org/bouncycastle/crypto/generators/HKDFBytesGenerator.java \
 org/bouncycastle/crypto/generators/KDF1BytesGenerator.java \
 org/bouncycastle/crypto/generators/KDF2BytesGenerator.java \
 org/bouncycastle/crypto/generators/MGF1BytesGenerator.java \
-org/bouncycastle/crypto/generators/NTRUEncryptionKeyPairGenerator.java \
-org/bouncycastle/crypto/generators/NTRUSigningKeyPairGenerator.java \
 org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java \
 org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java \
 org/bouncycastle/crypto/generators/SCrypt.java \
@@ -237,13 +248,16 @@ org/bouncycastle/crypto/io/package.html \
 org/bouncycastle/crypto/macs/BlockCipherMac.java \
 org/bouncycastle/crypto/macs/CFBBlockCipherMac.java \
 org/bouncycastle/crypto/macs/CMac.java \
+org/bouncycastle/crypto/macs/GMac.java \
 org/bouncycastle/crypto/macs/GOST28147Mac.java \
 org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java \
 org/bouncycastle/crypto/macs/OldHMac.java \
+org/bouncycastle/crypto/macs/SipHash.java \
 org/bouncycastle/crypto/macs/VMPCMac.java \
 org/bouncycastle/crypto/macs/package.html \
 org/bouncycastle/crypto/modes/EAXBlockCipher.java \
 org/bouncycastle/crypto/modes/GOFBBlockCipher.java \
+org/bouncycastle/crypto/modes/OCBBlockCipher.java \
 org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java \
 org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java \
 org/bouncycastle/crypto/modes/PaddedBlockCipher.java \
@@ -273,16 +287,6 @@ org/bouncycastle/crypto/params/KDFParameters.java \
 org/bouncycastle/crypto/params/MGFParameters.java \
 org/bouncycastle/crypto/params/MQVPrivateParameters.java \
 org/bouncycastle/crypto/params/MQVPublicParameters.java \
-org/bouncycastle/crypto/params/NTRUEncryptionKeyGenerationParameters.java \
-org/bouncycastle/crypto/params/NTRUEncryptionKeyParameters.java \
-org/bouncycastle/crypto/params/NTRUEncryptionParameters.java \
-org/bouncycastle/crypto/params/NTRUEncryptionPrivateKeyParameters.java \
-org/bouncycastle/crypto/params/NTRUEncryptionPublicKeyParameters.java \
-org/bouncycastle/crypto/params/NTRUParameters.java \
-org/bouncycastle/crypto/params/NTRUSigningKeyGenerationParameters.java \
-org/bouncycastle/crypto/params/NTRUSigningParameters.java \
-org/bouncycastle/crypto/params/NTRUSigningPrivateKeyParameters.java \
-org/bouncycastle/crypto/params/NTRUSigningPublicKeyParameters.java \
 org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java \
 org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java \
 org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java \
@@ -301,8 +305,6 @@ org/bouncycastle/crypto/signers/GOST3410Signer.java \
 org/bouncycastle/crypto/signers/GenericSigner.java \
 org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java \
 org/bouncycastle/crypto/signers/ISO9796d2Signer.java \
-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 \
@@ -312,10 +314,12 @@ 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/IES.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/GOST3410Util.java \
 org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java \
 org/bouncycastle/jcajce/provider/digest/GOST3411.java \
 org/bouncycastle/jcajce/provider/digest/MD2.java \
@@ -338,21 +342,22 @@ org/bouncycastle/jcajce/provider/symmetric/HC128.java \
 org/bouncycastle/jcajce/provider/symmetric/HC256.java \
 org/bouncycastle/jcajce/provider/symmetric/IDEA.java \
 org/bouncycastle/jcajce/provider/symmetric/Noekeon.java \
-org/bouncycastle/jcajce/provider/symmetric/RC2.java \
+org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java \
 org/bouncycastle/jcajce/provider/symmetric/RC5.java \
 org/bouncycastle/jcajce/provider/symmetric/RC6.java \
 org/bouncycastle/jcajce/provider/symmetric/Rijndael.java \
 org/bouncycastle/jcajce/provider/symmetric/SEED.java \
 org/bouncycastle/jcajce/provider/symmetric/Salsa20.java \
 org/bouncycastle/jcajce/provider/symmetric/Serpent.java \
+org/bouncycastle/jcajce/provider/symmetric/SipHash.java \
 org/bouncycastle/jcajce/provider/symmetric/Skipjack.java \
 org/bouncycastle/jcajce/provider/symmetric/TEA.java \
-org/bouncycastle/jcajce/provider/symmetric/Twofish.java \
 org/bouncycastle/jcajce/provider/symmetric/VMPC.java \
 org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java \
 org/bouncycastle/jcajce/provider/symmetric/XTEA.java \
 org/bouncycastle/jce/ECGOST3410NamedCurveTable.java \
 org/bouncycastle/jce/ECKeyUtil.java \
+org/bouncycastle/jce/ECNamedCurveTable.java \
 org/bouncycastle/jce/ECPointUtil.java \
 org/bouncycastle/jce/MultiCertStoreParameters.java \
 org/bouncycastle/jce/PKCS12Util.java \
@@ -375,11 +380,8 @@ org/bouncycastle/jce/package.html \
 org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java \
 org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java \
 org/bouncycastle/jce/provider/BrokenPBE.java \
-org/bouncycastle/jce/provider/ElGamalUtil.java \
-org/bouncycastle/jce/provider/GOST3410Util.java \
 org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java \
 org/bouncycastle/jce/provider/JCEElGamalPublicKey.java \
-org/bouncycastle/jce/provider/JCEIESCipher.java \
 org/bouncycastle/jce/provider/MultiCertStoreSpi.java \
 org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java \
 org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java \
@@ -414,6 +416,7 @@ org/bouncycastle/jce/spec/MQVPublicKeySpec.java \
 org/bouncycastle/jce/spec/package.html \
 org/bouncycastle/math/ec/ReferenceMultiplier.java \
 org/bouncycastle/math/ec/package.html \
+org/bouncycastle/util/MemoableResetException.java \
 org/bouncycastle/util/StreamParser.java \
 org/bouncycastle/util/StreamParsingException.java \
 org/bouncycastle/util/encoders/BufferedDecoder.java \
@@ -452,6 +455,7 @@ org/bouncycastle/cert/selector/jcajce \
 org/bouncycastle/cert/test \
 org/bouncycastle/cms/bc \
 org/bouncycastle/cms/test \
+org/bouncycastle/dvcs \
 org/bouncycastle/eac \
 org/bouncycastle/mozilla \
 org/bouncycastle/openssl \
@@ -462,6 +466,7 @@ org/bouncycastle/voms \
 
 # files
 UNNEEDED_BCPKIX_SOURCES+=" \
+org/bouncycastle/cert/CertRuntimeException.java \
 org/bouncycastle/cert/X509ExtensionUtils.java \
 org/bouncycastle/cert/X509v1CertificateBuilder.java \
 org/bouncycastle/cert/X509v2AttributeCertificateBuilder.java \
@@ -549,6 +554,7 @@ org/bouncycastle/cms/RecipientInfoGenerator.java \
 org/bouncycastle/cms/RecipientInformation.java \
 org/bouncycastle/cms/RecipientInformationStore.java \
 org/bouncycastle/cms/RecipientOperator.java \
+org/bouncycastle/cms/SignerInformationVerifierProvider.java \
 org/bouncycastle/cms/jcajce/CMSUtils.java \
 org/bouncycastle/cms/jcajce/DefaultJcaJceExtHelper.java \
 org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java \
@@ -585,6 +591,7 @@ org/bouncycastle/cms/jcajce/ZlibExpanderProvider.java \
 org/bouncycastle/cms/package.html \
 org/bouncycastle/operator/AsymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/AsymmetricKeyWrapper.java \
+org/bouncycastle/operator/DefaultSecretKeyProvider.java \
 org/bouncycastle/operator/GenericKey.java \
 org/bouncycastle/operator/InputDecryptor.java \
 org/bouncycastle/operator/InputDecryptorProvider.java \
@@ -596,6 +603,7 @@ org/bouncycastle/operator/MacCalculator.java \
 org/bouncycastle/operator/MacCalculatorProvider.java \
 org/bouncycastle/operator/OutputCompressor.java \
 org/bouncycastle/operator/OutputEncryptor.java \
+org/bouncycastle/operator/SecretKeySizeProvider.java \
 org/bouncycastle/operator/SymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/SymmetricKeyWrapper.java \
 org/bouncycastle/operator/bc/AESUtil.java \