Update elements in android tree as in lmp-dev

Android tree as in lmp-dev
c0d8909a6c6a4ac075a9dee7ac1fe6baff34acc0

Change-Id: I7553f53ba54ca317ab6eeed9523fe38832c40d48

5 files changed, 104 insertions, 73 deletions

diff --git a/Android.mk b/Android.mk
index 56c4b4fc..86cd8d6a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,27 +29,44 @@ ri_bcprov_src_files := $(filter-out \
  bcprov/src/main/java/org/bouncycastle/crypto/digests/OpenSSLDigest.java, \
  $(all_bcprov_src_files))
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := bouncycastle
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(android_bcprov_src_files)
-LOCAL_JAVACFLAGS := -encoding UTF-8
-LOCAL_JAVA_LIBRARIES := conscrypt core
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_JAVA_LIBRARY)
+# These cannot build in the PDK, because the PDK requires all libraries
+# compile against SDK versions. LOCAL_NO_STANDARD_LIBRARIES conflicts with
+# this requirement.
+ifneq ($(TARGET_BUILD_PDK),true)
 
-# non-jarjar version to build okhttp-tests
-include $(CLEAR_VARS)
-LOCAL_MODULE := bouncycastle-nojarjar
-LOCAL_MODULE_TAGS := optional
-LOCAL_SRC_FILES := $(android_bcprov_src_files)
-LOCAL_JAVACFLAGS := -encoding UTF-8
-LOCAL_JAVA_LIBRARIES := conscrypt core
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-include $(BUILD_STATIC_JAVA_LIBRARY)
+    include $(CLEAR_VARS)
+    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
+    LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+    include $(BUILD_JAVA_LIBRARY)
+
+    # non-jarjar version to build okhttp-tests
+    include $(CLEAR_VARS)
+    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
+    include $(BUILD_STATIC_JAVA_LIBRARY)
+
+    # unbundled bouncycastle jar
+    include $(CLEAR_VARS)
+    LOCAL_MODULE := bouncycastle-unbundled
+    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)
+endif # TARGET_BUILD_PDK != true
 
 # This is used to generate a list of what is unused so it can be removed when bouncycastle is updated.
 # Based on "Finding dead code" example in ProGuard manual at http://proguard.sourceforge.net/
@@ -91,18 +108,19 @@ bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs)
 		    public java.lang.String getPaddingName(); \
 		}"
 
-ifeq ($(WITH_HOST_DALVIK),true)
+# Conscrypt isn't built in the PDK, so this cannot be built because it has a
+# dependency on conscrypt-hostdex.
+ifneq ($(TARGET_BUILD_PDK),true)
     include $(CLEAR_VARS)
     LOCAL_MODULE := bouncycastle-hostdex
     LOCAL_MODULE_TAGS := optional
     LOCAL_SRC_FILES := $(all_bcprov_src_files)
     LOCAL_JAVACFLAGS := -encoding UTF-8
-    LOCAL_BUILD_HOST_DEX := true
     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_JAVA_LIBRARY)
+    include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 endif
 
 include $(CLEAR_VARS)
diff --git a/NOTICE b/NOTICE
index d89ebe33..b7e58c18 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Copyright (c) 2000-2013 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
+Copyright (c) 2000-2013 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 338b5724..51521c83 100644
--- a/bouncycastle.config
+++ b/bouncycastle.config
@@ -1,5 +1,6 @@
 # directories
 UNNEEDED_BCPROV_SOURCES=" \
+org/bouncycastle/apache \
 org/bouncycastle/asn1/cmp \
 org/bouncycastle/asn1/cms/ecc \
 org/bouncycastle/asn1/crmf \
@@ -16,8 +17,8 @@ org/bouncycastle/asn1/smime \
 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/kdf \
 org/bouncycastle/crypto/agreement/srp \
 org/bouncycastle/crypto/commitments \
 org/bouncycastle/crypto/ec \
@@ -26,9 +27,10 @@ org/bouncycastle/crypto/kems \
 org/bouncycastle/crypto/prng \
 org/bouncycastle/crypto/tls/ \
 org/bouncycastle/i18n/ \
+org/bouncycastle/jcajce/io \
+org/bouncycastle/jcajce/provider/asymmetric/dstu \
 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 \
@@ -50,6 +52,7 @@ org/bouncycastle/asn1/cms/AuthEnvelopedData.java \
 org/bouncycastle/asn1/cms/AuthEnvelopedDataParser.java \
 org/bouncycastle/asn1/cms/AuthenticatedData.java \
 org/bouncycastle/asn1/cms/AuthenticatedDataParser.java \
+org/bouncycastle/asn1/cms/CCMParameters.java \
 org/bouncycastle/asn1/cms/CompressedData.java \
 org/bouncycastle/asn1/cms/CompressedDataParser.java \
 org/bouncycastle/asn1/cms/ContentInfoParser.java \
@@ -83,7 +86,6 @@ org/bouncycastle/asn1/cms/TimeStampAndCRL.java \
 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/BidirectionalMap.java \
 org/bouncycastle/asn1/eac/CVCertificate.java \
 org/bouncycastle/asn1/eac/CVCertificateRequest.java \
@@ -111,18 +113,11 @@ org/bouncycastle/asn1/isismtt/x509/ProfessionInfo.java \
 org/bouncycastle/asn1/isismtt/x509/Restriction.java \
 org/bouncycastle/asn1/misc/CAST5CBCParameters.java \
 org/bouncycastle/asn1/misc/IDEACBCPar.java \
-org/bouncycastle/asn1/misc/package.html \
-org/bouncycastle/asn1/nist/package.html \
 org/bouncycastle/asn1/oiw/ElGamalParameter.java \
-org/bouncycastle/asn1/oiw/package.html \
-org/bouncycastle/asn1/package.html \
 org/bouncycastle/asn1/pkcs/Attribute.java \
 org/bouncycastle/asn1/pkcs/RC2CBCParameter.java \
 org/bouncycastle/asn1/pkcs/SignerInfo.java \
-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 \
@@ -132,7 +127,6 @@ 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 \
 org/bouncycastle/asn1/x509/AccessDescription.java \
 org/bouncycastle/asn1/x509/AuthorityInformationAccess.java \
 org/bouncycastle/asn1/x509/CertPolicyId.java \
@@ -155,24 +149,22 @@ org/bouncycastle/asn1/x509/UserNotice.java \
 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/DigestDerivationFunction.java \
 org/bouncycastle/crypto/EphemeralKeyPair.java \
 org/bouncycastle/crypto/KeyEncapsulation.java \
 org/bouncycastle/crypto/KeyEncoder.java \
 org/bouncycastle/crypto/KeyParser.java \
+org/bouncycastle/crypto/MacDerivationFunction.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 \
@@ -181,21 +173,22 @@ 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/SM3Digest.java \
 org/bouncycastle/crypto/digests/ShortenedDigest.java \
+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/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 \
 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/ElGamalEngine.java \
 org/bouncycastle/crypto/engines/GOST28147Engine.java \
 org/bouncycastle/crypto/engines/Grain128Engine.java \
@@ -220,12 +213,14 @@ org/bouncycastle/crypto/engines/SEEDEngine.java \
 org/bouncycastle/crypto/engines/SEEDWrapEngine.java \
 org/bouncycastle/crypto/engines/Salsa20Engine.java \
 org/bouncycastle/crypto/engines/SerpentEngine.java \
+org/bouncycastle/crypto/engines/Shacal2Engine.java \
 org/bouncycastle/crypto/engines/SkipjackEngine.java \
 org/bouncycastle/crypto/engines/TEAEngine.java \
+org/bouncycastle/crypto/engines/ThreefishEngine.java \
 org/bouncycastle/crypto/engines/VMPCEngine.java \
 org/bouncycastle/crypto/engines/VMPCKSA3Engine.java \
+org/bouncycastle/crypto/engines/XSalsa20Engine.java \
 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 \
@@ -237,14 +232,19 @@ 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/KDFCounterBytesGenerator.java \
+org/bouncycastle/crypto/generators/KDFDoublePipelineIterationBytesGenerator.java \
+org/bouncycastle/crypto/generators/KDFFeedbackBytesGenerator.java \
 org/bouncycastle/crypto/generators/MGF1BytesGenerator.java \
 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/generators/package.html \
+org/bouncycastle/crypto/io/CipherInputStream.java \
+org/bouncycastle/crypto/io/CipherOutputStream.java \
+org/bouncycastle/crypto/io/InvalidCipherTextIOException.java \
 org/bouncycastle/crypto/io/SignerInputStream.java \
 org/bouncycastle/crypto/io/SignerOutputStream.java \
-org/bouncycastle/crypto/io/package.html \
 org/bouncycastle/crypto/macs/BlockCipherMac.java \
 org/bouncycastle/crypto/macs/CFBBlockCipherMac.java \
 org/bouncycastle/crypto/macs/CMac.java \
@@ -252,21 +252,21 @@ 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/Poly1305.java \
 org/bouncycastle/crypto/macs/SipHash.java \
+org/bouncycastle/crypto/macs/SkeinMac.java \
 org/bouncycastle/crypto/macs/VMPCMac.java \
-org/bouncycastle/crypto/macs/package.html \
 org/bouncycastle/crypto/modes/EAXBlockCipher.java \
+org/bouncycastle/crypto/modes/GCFBBlockCipher.java \
 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/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/modes/package.html \
-org/bouncycastle/crypto/package.html \
-org/bouncycastle/crypto/paddings/package.html \
 org/bouncycastle/crypto/params/CCMParameters.java \
 org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java \
 org/bouncycastle/crypto/params/ElGamalKeyParameters.java \
@@ -283,6 +283,9 @@ org/bouncycastle/crypto/params/HKDFParameters.java \
 org/bouncycastle/crypto/params/IESParameters.java \
 org/bouncycastle/crypto/params/IESWithCipherParameters.java \
 org/bouncycastle/crypto/params/ISO18033KDFParameters.java \
+org/bouncycastle/crypto/params/KDFCounterParameters.java \
+org/bouncycastle/crypto/params/KDFDoublePipelineIterationParameters.java \
+org/bouncycastle/crypto/params/KDFFeedbackParameters.java \
 org/bouncycastle/crypto/params/KDFParameters.java \
 org/bouncycastle/crypto/params/MGFParameters.java \
 org/bouncycastle/crypto/params/MQVPrivateParameters.java \
@@ -294,7 +297,8 @@ 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/package.html \
+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 \
@@ -303,13 +307,12 @@ org/bouncycastle/crypto/signers/ECGOST3410Signer.java \
 org/bouncycastle/crypto/signers/ECNRSigner.java \
 org/bouncycastle/crypto/signers/GOST3410Signer.java \
 org/bouncycastle/crypto/signers/GenericSigner.java \
+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/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 \
@@ -328,13 +331,15 @@ 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/SHA3.java \
+org/bouncycastle/jcajce/provider/digest/SM3.java \
+org/bouncycastle/jcajce/provider/digest/Skein.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/ChaCha.java \
 org/bouncycastle/jcajce/provider/symmetric/GOST28147.java \
 org/bouncycastle/jcajce/provider/symmetric/Grain128.java \
 org/bouncycastle/jcajce/provider/symmetric/Grainv1.java \
@@ -349,15 +354,20 @@ 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/Shacal2.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/Threefish.java \
 org/bouncycastle/jcajce/provider/symmetric/VMPC.java \
 org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java \
+org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java \
 org/bouncycastle/jcajce/provider/symmetric/XTEA.java \
+org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java \
+org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java \
+org/bouncycastle/jcajce/spec/SkeinParameterSpec.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,8 +385,6 @@ org/bouncycastle/jce/interfaces/GOST3410PublicKey.java \
 org/bouncycastle/jce/interfaces/IESKey.java \
 org/bouncycastle/jce/interfaces/MQVPrivateKey.java \
 org/bouncycastle/jce/interfaces/MQVPublicKey.java \
-org/bouncycastle/jce/interfaces/package.html \
-org/bouncycastle/jce/package.html \
 org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java \
 org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java \
 org/bouncycastle/jce/provider/BrokenPBE.java \
@@ -413,10 +421,17 @@ org/bouncycastle/jce/spec/IEKeySpec.java \
 org/bouncycastle/jce/spec/IESParameterSpec.java \
 org/bouncycastle/jce/spec/MQVPrivateKeySpec.java \
 org/bouncycastle/jce/spec/MQVPublicKeySpec.java \
-org/bouncycastle/jce/spec/package.html \
+org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java \
+org/bouncycastle/math/ec/DoubleAddMultiplier.java \
+org/bouncycastle/math/ec/MixedNafR2LMultiplier.java \
+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/package.html \
+org/bouncycastle/math/ec/ZSignedDigitL2RMultiplier.java \
+org/bouncycastle/math/ec/ZSignedDigitR2LMultiplier.java \
 org/bouncycastle/util/MemoableResetException.java \
+org/bouncycastle/util/Shorts.java \
 org/bouncycastle/util/StreamParser.java \
 org/bouncycastle/util/StreamParsingException.java \
 org/bouncycastle/util/encoders/BufferedDecoder.java \
@@ -425,7 +440,7 @@ org/bouncycastle/util/encoders/HexTranslator.java \
 org/bouncycastle/util/encoders/Translator.java \
 org/bouncycastle/util/encoders/UrlBase64.java \
 org/bouncycastle/util/encoders/UrlBase64Encoder.java \
-org/bouncycastle/util/encoders/package.html \
+org/bouncycastle/util/io/BufferingOutputStream.java \
 org/bouncycastle/x509/CertPathReviewerException.java \
 org/bouncycastle/x509/CertPathReviewerMessages_de.properties \
 org/bouncycastle/x509/NoSuchParserException.java \
@@ -433,12 +448,11 @@ org/bouncycastle/x509/PKIXCertPathReviewer.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/extension/package.html \
-org/bouncycastle/x509/package.html \
 org/bouncycastle/x509/util/LDAPStoreHelper.java \
 org/bouncycastle/x509/util/StreamParser.java \
 org/bouncycastle/x509/util/StreamParsingException.java \
@@ -451,6 +465,7 @@ org/bouncycastle/cert/bc \
 org/bouncycastle/cert/cmp \
 org/bouncycastle/cert/crmf \
 org/bouncycastle/cert/ocsp \
+org/bouncycastle/cert/path \
 org/bouncycastle/cert/selector/jcajce \
 org/bouncycastle/cert/test \
 org/bouncycastle/cms/bc \
@@ -467,6 +482,7 @@ org/bouncycastle/voms \
 # files
 UNNEEDED_BCPKIX_SOURCES+=" \
 org/bouncycastle/cert/CertRuntimeException.java \
+org/bouncycastle/cert/X509ContentVerifierProviderBuilder.java \
 org/bouncycastle/cert/X509ExtensionUtils.java \
 org/bouncycastle/cert/X509v1CertificateBuilder.java \
 org/bouncycastle/cert/X509v2AttributeCertificateBuilder.java \
@@ -482,17 +498,15 @@ org/bouncycastle/cert/jcajce/JcaX509AttributeCertificateHolder.java \
 org/bouncycastle/cert/jcajce/JcaX509CRLConverter.java \
 org/bouncycastle/cert/jcajce/JcaX509CRLHolder.java \
 org/bouncycastle/cert/jcajce/JcaX509CertificateConverter.java \
+org/bouncycastle/cert/jcajce/JcaX509ContentVerifierProviderBuilder.java \
 org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java \
 org/bouncycastle/cert/jcajce/JcaX509v1CertificateBuilder.java \
 org/bouncycastle/cert/jcajce/JcaX509v2CRLBuilder.java \
 org/bouncycastle/cert/jcajce/JcaX509v3CertificateBuilder.java \
 org/bouncycastle/cert/jcajce/NamedCertHelper.java \
 org/bouncycastle/cert/jcajce/ProviderCertHelper.java \
-org/bouncycastle/cert/jcajce/package.html \
-org/bouncycastle/cert/package.html \
 org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelector.java \
 org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelectorBuilder.java \
-org/bouncycastle/cert/selector/package.html \
 org/bouncycastle/cms/AuthAttributesProvider.java \
 org/bouncycastle/cms/CMSAlgorithm.java \
 org/bouncycastle/cms/CMSAuthEnvelopedData.java \
@@ -518,7 +532,6 @@ org/bouncycastle/cms/CMSEnvelopedDataParser.java \
 org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java \
 org/bouncycastle/cms/CMSEnvelopedGenerator.java \
 org/bouncycastle/cms/CMSEnvelopedHelper.java \
-org/bouncycastle/cms/CMSPBEKey.java \
 org/bouncycastle/cms/CMSProcessableFile.java \
 org/bouncycastle/cms/CMSProcessableInputStream.java \
 org/bouncycastle/cms/CMSSecureReadable.java \
@@ -542,8 +555,6 @@ org/bouncycastle/cms/KeyTransRecipientInformation.java \
 org/bouncycastle/cms/OriginatorId.java \
 org/bouncycastle/cms/OriginatorInfoGenerator.java \
 org/bouncycastle/cms/OriginatorInformation.java \
-org/bouncycastle/cms/PKCS5Scheme2PBEKey.java \
-org/bouncycastle/cms/PKCS5Scheme2UTF8PBEKey.java \
 org/bouncycastle/cms/PasswordRecipient.java \
 org/bouncycastle/cms/PasswordRecipientId.java \
 org/bouncycastle/cms/PasswordRecipientInfoGenerator.java \
@@ -588,10 +599,10 @@ 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/cms/package.html \
 org/bouncycastle/operator/AsymmetricKeyUnwrapper.java \
 org/bouncycastle/operator/AsymmetricKeyWrapper.java \
-org/bouncycastle/operator/DefaultSecretKeyProvider.java \
+org/bouncycastle/operator/BufferingContentSigner.java \
+org/bouncycastle/operator/DefaultSecretKeySizeProvider.java \
 org/bouncycastle/operator/GenericKey.java \
 org/bouncycastle/operator/InputDecryptor.java \
 org/bouncycastle/operator/InputDecryptorProvider.java \
@@ -625,13 +636,13 @@ 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/JcaAlgorithmParametersConverter.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 \
-org/bouncycastle/operator/package.html \
 "
 
 # needed sources to copy in
diff --git a/bouncycastle.version b/bouncycastle.version
index 89e1ea4c..45c0f80d 100644
--- a/bouncycastle.version
+++ b/bouncycastle.version
@@ -1,2 +1,2 @@
 BOUNCYCASTLE_JDK=15on
-BOUNCYCASTLE_VERSION=149
+BOUNCYCASTLE_VERSION=150
diff --git a/import_bouncycastle.sh b/import_bouncycastle.sh
index ed278d83..0dfe4849 100755
--- a/import_bouncycastle.sh
+++ b/import_bouncycastle.sh
@@ -28,6 +28,8 @@
 set -e
 trap  "echo WARNING: Exiting on non-zero subprocess exit code" ERR;
 
+cd $(dirname $0)
+
 function die() {
   declare -r message=$1
 
@@ -57,7 +59,7 @@ function main() {
     die "bouncycastle.version not found"
   fi
 
-  source bouncycastle.version
+  source ./bouncycastle.version
   if [ "$BOUNCYCASTLE_JDK" == "" -o "$BOUNCYCASTLE_VERSION" == "" ]; then
     die "Invalid bouncycastle.version; see README.android for more information"
   fi
@@ -72,7 +74,7 @@ function main() {
     die "bouncycastle.config not found"
   fi
 
-  source bouncycastle.config
+  source ./bouncycastle.config
   if [ "$UNNEEDED_BCPROV_SOURCES" == "" -o "$NEEDED_BCPROV_SOURCES" == "" \
     -o "$UNNEEDED_BCPKIX_SOURCES" == "" -o "$NEEDED_BCPKIX_SOURCES" == "" ]; then
     die "Invalid bouncycastle.config; see README.android for more information"