diff options
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | NOTICE | 2 | ||||
| -rw-r--r-- | bouncycastle.config | 71 | ||||
| -rw-r--r-- | bouncycastle.version | 2 | ||||
| -rwxr-xr-x | import_bouncycastle.sh | 4 |
5 files changed, 63 insertions, 28 deletions
@@ -38,7 +38,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt @@ -50,7 +49,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -62,7 +60,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 9 LOCAL_SRC_FILES := $(ri_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -108,26 +105,26 @@ bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs) public java.lang.String getPaddingName(); \ }" -# Conscrypt isn't built in the PDK, so this cannot be built because it has a -# dependency on conscrypt-hostdex. +# Conscrypt isn't built in the PDK or on non-linux OSes, so this cannot be built +# because it has a dependency on conscrypt-hostdex. ifneq ($(TARGET_BUILD_PDK),true) + ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-hostdex LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + endif # ($(HOST_OS),linux) endif include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-host LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(ri_bcprov_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_JAVA_LIBRARY) @@ -136,7 +133,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-bcpkix-host LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under,bcpkix/src/main/java) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := bouncycastle-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -1,4 +1,4 @@ -Copyright (c) 2000-2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) +Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, diff --git a/bouncycastle.config b/bouncycastle.config index 51521c83..12ccaaad 100644 --- a/bouncycastle.config +++ b/bouncycastle.config @@ -1,6 +1,6 @@ # directories UNNEEDED_BCPROV_SOURCES=" \ -org/bouncycastle/apache \ +org/bouncycastle/asn1/bsi \ org/bouncycastle/asn1/cmp \ org/bouncycastle/asn1/cms/ecc \ org/bouncycastle/asn1/crmf \ @@ -14,17 +14,22 @@ org/bouncycastle/asn1/microsoft \ org/bouncycastle/asn1/mozilla \ org/bouncycastle/asn1/ocsp \ org/bouncycastle/asn1/smime \ +org/bouncycastle/asn1/test \ org/bouncycastle/asn1/tsp \ +org/bouncycastle/asn1/ua \ org/bouncycastle/asn1/x509/qualified \ org/bouncycastle/asn1/x509/sigi \ org/bouncycastle/crypto/agreement/jpake \ org/bouncycastle/crypto/agreement/kdf \ org/bouncycastle/crypto/agreement/srp \ +org/bouncycastle/crypto/agreement/test \ org/bouncycastle/crypto/commitments \ -org/bouncycastle/crypto/ec \ +org/bouncycastle/crypto/ec/test \ org/bouncycastle/crypto/examples \ org/bouncycastle/crypto/kems \ +org/bouncycastle/crypto/parsers \ org/bouncycastle/crypto/prng \ +org/bouncycastle/crypto/test/ \ org/bouncycastle/crypto/tls/ \ org/bouncycastle/i18n/ \ org/bouncycastle/jcajce/io \ @@ -35,6 +40,8 @@ org/bouncycastle/jcajce/provider/asymmetric/gost \ org/bouncycastle/jcajce/provider/asymmetric/ies \ org/bouncycastle/jce/examples \ org/bouncycastle/jce/provider/test \ +org/bouncycastle/math/ec/custom/djb \ +org/bouncycastle/math/ec/tools \ org/bouncycastle/ocsp \ org/bouncycastle/pqc \ org/bouncycastle/util/test \ @@ -118,13 +125,6 @@ org/bouncycastle/asn1/pkcs/Attribute.java \ org/bouncycastle/asn1/pkcs/RC2CBCParameter.java \ org/bouncycastle/asn1/pkcs/SignerInfo.java \ org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java \ -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/x509/AccessDescription.java \ @@ -165,6 +165,8 @@ 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/generators/BCrypt.java \ +org/bouncycastle/crypto/generators/OpenBSDBCrypt.java \ org/bouncycastle/crypto/digests/GOST3411Digest.java \ org/bouncycastle/crypto/digests/MD2Digest.java \ org/bouncycastle/crypto/digests/MD4Digest.java \ @@ -181,14 +183,28 @@ org/bouncycastle/crypto/digests/SkeinDigest.java \ org/bouncycastle/crypto/digests/SkeinEngine.java \ org/bouncycastle/crypto/digests/TigerDigest.java \ org/bouncycastle/crypto/digests/WhirlpoolDigest.java \ +org/bouncycastle/crypto/ec/ECDecryptor.java \ +org/bouncycastle/crypto/ec/ECElGamalDecryptor.java \ +org/bouncycastle/crypto/ec/ECElGamalEncryptor.java \ +org/bouncycastle/crypto/ec/ECEncryptor.java \ +org/bouncycastle/crypto/ec/ECFixedTransform.java \ +org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java \ +org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java \ +org/bouncycastle/crypto/ec/ECPair.java \ +org/bouncycastle/crypto/ec/ECPairFactorTransform.java \ +org/bouncycastle/crypto/ec/ECPairTransform.java \ +org/bouncycastle/crypto/ec/ECUtil.java \ org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java \ org/bouncycastle/crypto/engines/AESLightEngine.java \ +org/bouncycastle/crypto/engines/AESWrapPadEngine.java \ org/bouncycastle/crypto/engines/CAST5Engine.java \ org/bouncycastle/crypto/engines/CAST6Engine.java \ org/bouncycastle/crypto/engines/CamelliaEngine.java \ org/bouncycastle/crypto/engines/CamelliaLightEngine.java \ org/bouncycastle/crypto/engines/CamelliaWrapEngine.java \ org/bouncycastle/crypto/engines/ChaChaEngine.java \ +org/bouncycastle/crypto/engines/CramerShoupCiphertext.java \ +org/bouncycastle/crypto/engines/CramerShoupCoreEngine.java \ org/bouncycastle/crypto/engines/ElGamalEngine.java \ org/bouncycastle/crypto/engines/GOST28147Engine.java \ org/bouncycastle/crypto/engines/Grain128Engine.java \ @@ -206,6 +222,7 @@ org/bouncycastle/crypto/engines/RC532Engine.java \ org/bouncycastle/crypto/engines/RC564Engine.java \ org/bouncycastle/crypto/engines/RC6Engine.java \ org/bouncycastle/crypto/engines/RFC3211WrapEngine.java \ +org/bouncycastle/crypto/engines/RFC5649WrapEngine.java \ org/bouncycastle/crypto/engines/RSABlindingEngine.java \ org/bouncycastle/crypto/engines/RSAEngine.java \ org/bouncycastle/crypto/engines/RijndaelEngine.java \ @@ -222,6 +239,8 @@ org/bouncycastle/crypto/engines/VMPCKSA3Engine.java \ org/bouncycastle/crypto/engines/XSalsa20Engine.java \ org/bouncycastle/crypto/engines/XTEAEngine.java \ org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java \ +org/bouncycastle/crypto/generators/CramerShoupKeyPairGenerator.java \ +org/bouncycastle/crypto/generators/CramerShoupParametersGenerator.java \ org/bouncycastle/crypto/generators/DHKeyPairGenerator.java \ org/bouncycastle/crypto/generators/DSTU4145KeyPairGenerator.java \ org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java \ @@ -240,6 +259,7 @@ org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java \ org/bouncycastle/crypto/generators/Poly1305KeyGenerator.java \ org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java \ org/bouncycastle/crypto/generators/SCrypt.java \ +org/bouncycastle/crypto/io/CipherIOException.java \ org/bouncycastle/crypto/io/CipherInputStream.java \ org/bouncycastle/crypto/io/CipherOutputStream.java \ org/bouncycastle/crypto/io/InvalidCipherTextIOException.java \ @@ -248,6 +268,7 @@ org/bouncycastle/crypto/io/SignerOutputStream.java \ org/bouncycastle/crypto/macs/BlockCipherMac.java \ org/bouncycastle/crypto/macs/CFBBlockCipherMac.java \ org/bouncycastle/crypto/macs/CMac.java \ +org/bouncycastle/crypto/macs/CMacWithIV.java \ org/bouncycastle/crypto/macs/GMac.java \ org/bouncycastle/crypto/macs/GOST28147Mac.java \ org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java \ @@ -262,12 +283,18 @@ org/bouncycastle/crypto/modes/GOFBBlockCipher.java \ org/bouncycastle/crypto/modes/OCBBlockCipher.java \ org/bouncycastle/crypto/modes/OldCTSBlockCipher.java \ org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java \ +org/bouncycastle/crypto/modes/NISTCTSBlockCipher.java \ 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/Tables64kGCMMultiplier.java \ org/bouncycastle/crypto/params/CCMParameters.java \ +org/bouncycastle/crypto/params/CramerShoupKeyGenerationParameters.java \ +org/bouncycastle/crypto/params/CramerShoupKeyParameters.java \ +org/bouncycastle/crypto/params/CramerShoupParameters.java \ +org/bouncycastle/crypto/params/CramerShoupPrivateKeyParameters.java \ +org/bouncycastle/crypto/params/CramerShoupPublicKeyParameters.java \ org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java \ org/bouncycastle/crypto/params/ElGamalKeyParameters.java \ org/bouncycastle/crypto/params/ElGamalParameters.java \ @@ -297,10 +324,9 @@ org/bouncycastle/crypto/params/ParametersWithSBox.java \ org/bouncycastle/crypto/params/ParametersWithSalt.java \ org/bouncycastle/crypto/params/RC5Parameters.java \ org/bouncycastle/crypto/params/RSABlindingParameters.java \ +org/bouncycastle/crypto/params/SRP6GroupParameters.java \ org/bouncycastle/crypto/params/SkeinParameters.java \ org/bouncycastle/crypto/params/TweakableBlockCipherParameters.java \ -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 \ @@ -311,8 +337,11 @@ org/bouncycastle/crypto/signers/HMacDSAKCalculator.java \ org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java \ org/bouncycastle/crypto/signers/ISO9796d2Signer.java \ org/bouncycastle/crypto/signers/PSSSigner.java \ +org/bouncycastle/crypto/signers/X931Signer.java \ org/bouncycastle/crypto/util/PrivateKeyInfoFactory.java \ org/bouncycastle/crypto/util/SubjectPublicKeyInfoFactory.java \ +org/bouncycastle/jcajce/PKCS12Key.java \ +org/bouncycastle/jcajce/PKCS12KeyWithParameters.java \ org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java \ org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java \ org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java \ @@ -322,6 +351,7 @@ 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/rsa/X931SignatureSpi.java \ org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java \ org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java \ org/bouncycastle/jcajce/provider/digest/GOST3411.java \ @@ -428,12 +458,15 @@ org/bouncycastle/math/ec/MontgomeryLadderMultiplier.java \ org/bouncycastle/math/ec/NafL2RMultiplier.java \ org/bouncycastle/math/ec/NafR2LMultiplier.java \ org/bouncycastle/math/ec/ReferenceMultiplier.java \ +org/bouncycastle/math/ec/ScaleYPointMap.java \ org/bouncycastle/math/ec/ZSignedDigitL2RMultiplier.java \ org/bouncycastle/math/ec/ZSignedDigitR2LMultiplier.java \ +org/bouncycastle/math/raw/Mont256.java \ org/bouncycastle/util/MemoableResetException.java \ org/bouncycastle/util/Shorts.java \ org/bouncycastle/util/StreamParser.java \ org/bouncycastle/util/StreamParsingException.java \ +org/bouncycastle/util/Times.java \ org/bouncycastle/util/encoders/BufferedDecoder.java \ org/bouncycastle/util/encoders/BufferedEncoder.java \ org/bouncycastle/util/encoders/HexTranslator.java \ @@ -444,14 +477,16 @@ org/bouncycastle/util/io/BufferingOutputStream.java \ org/bouncycastle/x509/CertPathReviewerException.java \ org/bouncycastle/x509/CertPathReviewerMessages_de.properties \ org/bouncycastle/x509/NoSuchParserException.java \ +org/bouncycastle/x509/PKIXCRLUtil.java \ org/bouncycastle/x509/PKIXCertPathReviewer.java \ +org/bouncycastle/x509/CertPathValidatorUtilities.java \ +org/bouncycastle/x509/CertStatus.java \ org/bouncycastle/x509/X509AttributeCertStoreSelector.java \ org/bouncycastle/x509/X509CertPairStoreSelector.java \ org/bouncycastle/x509/X509CertificatePair.java \ org/bouncycastle/x509/X509Store.java \ org/bouncycastle/x509/X509StreamParser.java \ org/bouncycastle/x509/X509StreamParserSpi.java \ -org/bouncycastle/x509/X509V2AttributeCertificateGenerator.java \ org/bouncycastle/x509/X509V2CRLGenerator.java \ org/bouncycastle/x509/util/LDAPStoreHelper.java \ org/bouncycastle/x509/util/StreamParser.java \ @@ -464,6 +499,7 @@ docs \ org/bouncycastle/cert/bc \ org/bouncycastle/cert/cmp \ org/bouncycastle/cert/crmf \ +org/bouncycastle/cert/dane \ org/bouncycastle/cert/ocsp \ org/bouncycastle/cert/path \ org/bouncycastle/cert/selector/jcajce \ @@ -474,7 +510,9 @@ org/bouncycastle/dvcs \ org/bouncycastle/eac \ org/bouncycastle/mozilla \ org/bouncycastle/openssl \ +org/bouncycastle/operator/test \ org/bouncycastle/pkcs \ +org/bouncycastle/pkix \ org/bouncycastle/tsp \ org/bouncycastle/voms \ " @@ -491,6 +529,7 @@ org/bouncycastle/cert/X509v3CertificateBuilder.java \ org/bouncycastle/cert/jcajce/CertHelper.java \ org/bouncycastle/cert/jcajce/DefaultCertHelper.java \ org/bouncycastle/cert/jcajce/JcaAttrCertStore.java \ +org/bouncycastle/cert/jcajce/JcaAttributeCertificateIssuer.java \ org/bouncycastle/cert/jcajce/JcaCRLStore.java \ org/bouncycastle/cert/jcajce/JcaCertStoreBuilder.java \ org/bouncycastle/cert/jcajce/JcaX500NameUtil.java \ @@ -555,16 +594,13 @@ org/bouncycastle/cms/KeyTransRecipientInformation.java \ org/bouncycastle/cms/OriginatorId.java \ org/bouncycastle/cms/OriginatorInfoGenerator.java \ org/bouncycastle/cms/OriginatorInformation.java \ -org/bouncycastle/cms/PasswordRecipient.java \ org/bouncycastle/cms/PasswordRecipientId.java \ org/bouncycastle/cms/PasswordRecipientInfoGenerator.java \ org/bouncycastle/cms/PasswordRecipientInformation.java \ -org/bouncycastle/cms/Recipient.java \ org/bouncycastle/cms/RecipientId.java \ 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 \ @@ -599,18 +635,17 @@ org/bouncycastle/cms/jcajce/NamedJcaJceExtHelper.java \ org/bouncycastle/cms/jcajce/ProviderJcaJceExtHelper.java \ org/bouncycastle/cms/jcajce/ZlibCompressor.java \ org/bouncycastle/cms/jcajce/ZlibExpanderProvider.java \ +org/bouncycastle/operator/AlgorithmNameFinder.java \ org/bouncycastle/operator/AsymmetricKeyUnwrapper.java \ org/bouncycastle/operator/AsymmetricKeyWrapper.java \ org/bouncycastle/operator/BufferingContentSigner.java \ +org/bouncycastle/operator/DefaultAlgorithmNameFinder.java \ org/bouncycastle/operator/DefaultSecretKeySizeProvider.java \ -org/bouncycastle/operator/GenericKey.java \ -org/bouncycastle/operator/InputDecryptor.java \ org/bouncycastle/operator/InputDecryptorProvider.java \ org/bouncycastle/operator/InputExpander.java \ org/bouncycastle/operator/InputExpanderProvider.java \ org/bouncycastle/operator/KeyUnwrapper.java \ org/bouncycastle/operator/KeyWrapper.java \ -org/bouncycastle/operator/MacCalculator.java \ org/bouncycastle/operator/MacCalculatorProvider.java \ org/bouncycastle/operator/OutputCompressor.java \ org/bouncycastle/operator/OutputEncryptor.java \ diff --git a/bouncycastle.version b/bouncycastle.version index 45c0f80d..6bbeb95f 100644 --- a/bouncycastle.version +++ b/bouncycastle.version @@ -1,2 +1,2 @@ BOUNCYCASTLE_JDK=15on -BOUNCYCASTLE_VERSION=150 +BOUNCYCASTLE_VERSION=152 diff --git a/import_bouncycastle.sh b/import_bouncycastle.sh index 0dfe4849..45cdae87 100755 --- a/import_bouncycastle.sh +++ b/import_bouncycastle.sh @@ -222,6 +222,10 @@ function untar() { echo "Removing $unneeded_sources" (cd $bouncycastle_dir_orig && rm -rf $unneeded_sources) (cd $bouncycastle_dir && rm -r $unneeded_sources) + + echo "Removing package.html files" + find $bouncycastle_dir_orig -name package.html -print0 | xargs -0 rm + find $bouncycastle_dir -name package.html -print0 | xargs -0 rm } function cleantar() { |