diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2021-02-26 18:40:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-26 18:40:09 +0000 |
| commit | c4e5343d2a6ebfd1eed7f571fde8bcc15f897359 (patch) | |
| tree | 7dde86f7920996ca262fd9ff09b34de734ffdc95 | |
| parent | bb4570fe170d39a04174fe7d6dac57eb10930de8 (diff) | |
| parent | 0a938fa0a4c887582ce0886b97a06a9210542baa (diff) | |
| download | bouncycastle-c4e5343d2a6ebfd1eed7f571fde8bcc15f897359.tar.gz | |
Merge "Bring back v1.61 PKCS12KeyStoreSpi behaviour." am: 84c892fb28 am: 61caa2a40f am: 0a938fa0a4
Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1609193
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a429769db604c402e2276742b5398259f876e3f
3 files changed, 14 insertions, 2 deletions
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(); 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 bd77e0e4..f53f8df0 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 @@ 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.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 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(); |