bouncycastle 1.47 upgrade

Change-Id: I601cc0dd434897d48c79abb67e9f833159135cce

1 files changed, 62 insertions, 52 deletions

diff --git a/bouncycastle.config b/bouncycastle.config
index 4132420b..aa3c96d4 100644
--- a/bouncycastle.config
+++ b/bouncycastle.config
@@ -14,43 +14,31 @@ org/bouncycastle/asn1/mozilla \
 org/bouncycastle/asn1/ntt \
 org/bouncycastle/asn1/ocsp \
 org/bouncycastle/asn1/smime \
-org/bouncycastle/asn1/test \
 org/bouncycastle/asn1/tsp \
 org/bouncycastle/asn1/x509/qualified \
 org/bouncycastle/asn1/x509/sigi \
-org/bouncycastle/bcpg \
-org/bouncycastle/cert \
-org/bouncycastle/cms \
 org/bouncycastle/crypto/agreement/kdf \
 org/bouncycastle/crypto/agreement/srp \
 org/bouncycastle/crypto/examples \
 org/bouncycastle/crypto/prng \
-org/bouncycastle/crypto/test \
 org/bouncycastle/crypto/tls/ \
 org/bouncycastle/i18n/ \
+org/bouncycastle/jcajce/provider/asymmetric/ecgost \
+org/bouncycastle/jcajce/provider/asymmetric/elgamal \
+org/bouncycastle/jcajce/provider/asymmetric/gost \
 org/bouncycastle/jce/examples \
 org/bouncycastle/jce/provider/test \
-org/bouncycastle/mail \
-org/bouncycastle/mozilla \
+org/bouncycastle/math/ntru \
 org/bouncycastle/ocsp \
-org/bouncycastle/openpgp \
-org/bouncycastle/openssl/test \
-org/bouncycastle/operator \
-org/bouncycastle/pkcs \
-org/bouncycastle/tsp \
-org/bouncycastle/util/encoders/test \
 org/bouncycastle/util/test \
-org/bouncycastle/voms \
 org/bouncycastle/x509/examples \
 "
 
 # files
 UNNEEDED_SOURCES+=" \
 org/bouncycastle/LICENSE.java \
-org/bouncycastle/asn1/ASN1Boolean.java \
 org/bouncycastle/asn1/ASN1Generator.java \
 org/bouncycastle/asn1/BERGenerator.java \
-org/bouncycastle/asn1/BERNull.java \
 org/bouncycastle/asn1/BEROctetStringGenerator.java \
 org/bouncycastle/asn1/BERSequenceGenerator.java \
 org/bouncycastle/asn1/DERGenerator.java \
@@ -155,7 +143,7 @@ org/bouncycastle/asn1/x509/Targets.java \
 org/bouncycastle/asn1/x509/UserNotice.java \
 org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java \
 org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java \
-org/bouncycastle/asn1/x509/X509Attributes.java \
+org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java \
 org/bouncycastle/asn1/x509/package.html \
 org/bouncycastle/asn1/x9/KeySpecificInfo.java \
 org/bouncycastle/asn1/x9/OtherInfo.java \
@@ -178,6 +166,7 @@ org/bouncycastle/crypto/digests/ShortenedDigest.java \
 org/bouncycastle/crypto/digests/TigerDigest.java \
 org/bouncycastle/crypto/digests/WhirlpoolDigest.java \
 org/bouncycastle/crypto/digests/package.html \
+org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java \
 org/bouncycastle/crypto/encodings/package.html \
 org/bouncycastle/crypto/engines/AESLightEngine.java \
 org/bouncycastle/crypto/engines/CAST5Engine.java \
@@ -194,6 +183,8 @@ 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 \
@@ -224,8 +215,11 @@ org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.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 \
 org/bouncycastle/crypto/generators/package.html \
 org/bouncycastle/crypto/io/SignerInputStream.java \
 org/bouncycastle/crypto/io/SignerOutputStream.java \
@@ -239,6 +233,7 @@ org/bouncycastle/crypto/macs/OldHMac.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/OpenPGPCFBBlockCipher.java \
 org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java \
 org/bouncycastle/crypto/modes/PaddedBlockCipher.java \
@@ -269,6 +264,16 @@ 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 \
@@ -284,9 +289,49 @@ 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/package.html \
+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/rsa/ISOSignatureSpi.java \
+org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java \
+org/bouncycastle/jcajce/provider/digest/GOST3411.java \
+org/bouncycastle/jcajce/provider/digest/MD2.java \
+org/bouncycastle/jcajce/provider/digest/MD4.java \
+org/bouncycastle/jcajce/provider/digest/RIPEMD128.java \
+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/Tiger.java \
+org/bouncycastle/jcajce/provider/digest/Whirlpool.java \
+org/bouncycastle/jcajce/provider/symmetric/CAST5.java \
+org/bouncycastle/jcajce/provider/symmetric/CAST6.java \
+org/bouncycastle/jcajce/provider/symmetric/Camellia.java \
+org/bouncycastle/jcajce/provider/symmetric/GOST28147.java \
+org/bouncycastle/jcajce/provider/symmetric/Grain128.java \
+org/bouncycastle/jcajce/provider/symmetric/Grainv1.java \
+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/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/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/ECPointUtil.java \
@@ -313,16 +358,9 @@ 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/JCEElGamalCipher.java \
 org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java \
 org/bouncycastle/jce/provider/JCEElGamalPublicKey.java \
 org/bouncycastle/jce/provider/JCEIESCipher.java \
-org/bouncycastle/jce/provider/JDKECDSAAlgParameters.java \
-org/bouncycastle/jce/provider/JDKGOST3410PrivateKey.java \
-org/bouncycastle/jce/provider/JDKGOST3410PublicKey.java \
-org/bouncycastle/jce/provider/JDKGOST3410Signer.java \
-org/bouncycastle/jce/provider/JDKISOSignature.java \
-org/bouncycastle/jce/provider/JDKPSSSigner.java \
 org/bouncycastle/jce/provider/MultiCertStoreSpi.java \
 org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java \
 org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java \
@@ -340,27 +378,6 @@ org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java \
 org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java \
 org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java \
 org/bouncycastle/jce/provider/X509StoreLDAPCerts.java \
-org/bouncycastle/jce/provider/symmetric/CAST5.java \
-org/bouncycastle/jce/provider/symmetric/CAST6.java \
-org/bouncycastle/jce/provider/symmetric/Camellia.java \
-org/bouncycastle/jce/provider/symmetric/Grain128.java \
-org/bouncycastle/jce/provider/symmetric/Grainv1.java \
-org/bouncycastle/jce/provider/symmetric/HC128.java \
-org/bouncycastle/jce/provider/symmetric/HC256.java \
-org/bouncycastle/jce/provider/symmetric/IDEA.java \
-org/bouncycastle/jce/provider/symmetric/Noekeon.java \
-org/bouncycastle/jce/provider/symmetric/RC5.java \
-org/bouncycastle/jce/provider/symmetric/RC6.java \
-org/bouncycastle/jce/provider/symmetric/Rijndael.java \
-org/bouncycastle/jce/provider/symmetric/SEED.java \
-org/bouncycastle/jce/provider/symmetric/Salsa20.java \
-org/bouncycastle/jce/provider/symmetric/Serpent.java \
-org/bouncycastle/jce/provider/symmetric/Skipjack.java \
-org/bouncycastle/jce/provider/symmetric/TEA.java \
-org/bouncycastle/jce/provider/symmetric/Twofish.java \
-org/bouncycastle/jce/provider/symmetric/VMPC.java \
-org/bouncycastle/jce/provider/symmetric/VMPCKSA3.java \
-org/bouncycastle/jce/provider/symmetric/XTEA.java \
 org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java \
 org/bouncycastle/jce/spec/ElGamalKeySpec.java \
 org/bouncycastle/jce/spec/ElGamalParameterSpec.java \
@@ -378,12 +395,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/math/ec/test \
-org/bouncycastle/openssl/PKCS8Generator.java \
-org/bouncycastle/openssl/package.html \
-org/bouncycastle/util/AllTests.java \
 org/bouncycastle/util/CollectionStore.java \
-org/bouncycastle/util/IPTest.java \
 org/bouncycastle/util/StreamParser.java \
 org/bouncycastle/util/StreamParsingException.java \
 org/bouncycastle/util/encoders/BufferedDecoder.java \
@@ -394,8 +406,6 @@ org/bouncycastle/util/encoders/UrlBase64.java \
 org/bouncycastle/util/encoders/UrlBase64Encoder.java \
 org/bouncycastle/util/encoders/package.html \
 org/bouncycastle/util/io/TeeInputStream.java \
-org/bouncycastle/util/io/TeeOutputStream.java \
-org/bouncycastle/util/io/pem/AllTests.java \
 org/bouncycastle/x509/CertPathReviewerException.java \
 org/bouncycastle/x509/CertPathReviewerMessages_de.properties \
 org/bouncycastle/x509/NoSuchParserException.java \