| commit | 947a733dbab3d8574b022b64ef81f9525029ad72 | [log] [tgz] |
|---|---|---|
| author | Almaz Mingaleev <mingaleev@google.com> | Fri Feb 26 11:50:23 2021 +0000 |
| committer | Almaz Mingaleev <mingaleev@google.com> | Fri Feb 26 12:19:53 2021 +0000 |
| tree | 7dde86f7920996ca262fd9ff09b34de734ffdc95 | |
| parent | a95a0e344772f97269ae5f51ff6b13d9ed243f03 [diff] |
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
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 9e9b4f1..4969e8a 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 @@ 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 @@ 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();
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java index bd77e0e..f53f8df 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
@@ -852,13 +852,17 @@ 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("com.android.org.bouncycastle.pkcs12.ignore_useless_passwd")) + if (!Properties.isOverrideSet("org.bouncycastle.pkcs12.ignore_useless_passwd")) { 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();
diff --git a/repackaged_platform/bcprov/src/main/java/com/android/internal/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java b/repackaged_platform/bcprov/src/main/java/com/android/internal/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java index 0788dac..0b4e2d9 100644 --- a/repackaged_platform/bcprov/src/main/java/com/android/internal/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java +++ b/repackaged_platform/bcprov/src/main/java/com/android/internal/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
@@ -852,13 +852,17 @@ 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("com.android.internal.org.bouncycastle.pkcs12.ignore_useless_passwd")) + if (!Properties.isOverrideSet("org.bouncycastle.pkcs12.ignore_useless_passwd")) { 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();