diff options
Diffstat (limited to 'bcprov/src/main/java')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java | 4 |
1 files changed, 4 insertions, 0 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(); |