diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2021-02-26 11:50:23 +0000 |
|---|---|---|
| committer | Almaz Mingaleev <mingaleev@google.com> | 2021-02-26 12:19:53 +0000 |
| commit | 947a733dbab3d8574b022b64ef81f9525029ad72 (patch) | |
| tree | 7dde86f7920996ca262fd9ff09b34de734ffdc95 /repackaged_platform | |
| parent | a95a0e344772f97269ae5f51ff6b13d9ed243f03 (diff) | |
| download | bouncycastle-947a733dbab3d8574b022b64ef81f9525029ad72.tar.gz | |
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
Diffstat (limited to 'repackaged_platform')
| -rw-r--r-- | repackaged_platform/bcprov/src/main/java/com/android/internal/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 0788dac7..0b4e2d90 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 @@ 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("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(); |