commit f39671d0a2b9d25a2b97ef5aafc4ebaf07e21bac
author Sergio Giro <sgiro@google.com> Tue Mar 15 19:25:39 2016 +0000
committer Sergio Giro <sgiro@google.com> Fri Mar 18 10:48:55 2016 +0000
tree 219da75b79047c008faa26d532d860122cb788c2
parent 94c83bd7c98a869732bb70faa08206c6c02ed85d

BaseBlockCipher: for BCEPBEKeys, ignore parameters if no IV is present

(cherry picked from commit d66ae962406981a998aa3d8a6c7311a8f23276a6)
Bug: 27224566

Change-Id: Ideceeba353aff5b3a4540b71f1ca40065058fd1d

bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java

diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
index da2b4d5..eec06f3 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -553,7 +553,15 @@
             }
             if (key instanceof BCPBEKey)
             {
-                if (((BCPBEKey)key).getParam() != null)
+                // BEGIN android-changed
+                // Was:
+                // if (((BCPBEKey)key).getParam() != null)
+                // Change taken from:
+                // https://github.com/bcgit/bc-java/commit/fcba5c782188d772148ba168beae368d06646ee2
+                // PKCS#12 sets an IV, if we get a key that doesn't have ParametersWithIV we need to forget about the fact
+                // it's a BCPBEKey
+                if (((BCPBEKey)key).getParam() != null && ((BCPBEKey)key).getParam() instanceof ParametersWithIV)
+                // END android-changed
                 {
                     param = ((BCPBEKey)key).getParam();
                 }