From 947a733dbab3d8574b022b64ef81f9525029ad72 Mon Sep 17 00:00:00 2001 From: Almaz Mingaleev Date: Fri, 26 Feb 2021 11:50:23 +0000 Subject: Bring back v1.61 PKCS12KeyStoreSpi behaviour. BC 1.68 does not allow non-empty password for a keystore that does not require one. Upstream change: https://github.com/bcgit/bc-java/commit/a2e6598949ee83c8c23b98a372749ca378342706 Bug: 181188659 Bug: 179780002 Test: checked manually logcat for NPE entries on toggling WiFi ON/OFF Change-Id: Ia9ee55dd99453af359babf4f23d0c5b8e4843878 --- .../jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bcprov/src/main/java/org') diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java index 9e9b4f1d..4969e8a3 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java @@ -848,6 +848,8 @@ public class PKCS12KeyStoreSpi throw new IOException("error constructing MAC: " + e.toString()); } } + // BEGIN Android-removed: keep v1.61 behaviour to keep backwards-compatibility + /* else if (password != null) { if (!Properties.isOverrideSet("org.bouncycastle.pkcs12.ignore_useless_passwd")) @@ -855,6 +857,8 @@ public class PKCS12KeyStoreSpi throw new IOException("password supplied for keystore that does not require one"); } } + */ + // END Android-removed: keep v1.61 behaviour to keep backwards-compatibility keys = new IgnoresCaseHashtable(); localIds = new Hashtable(); -- cgit v1.2.3