From 6981e03557b33c1682f50ab76348cafaf0bfe38e Mon Sep 17 00:00:00 2001 From: Sergio Giro Date: Fri, 18 Mar 2016 11:17:13 +0000 Subject: BaseBlockCipher: removed TODO about checking a fix Fix was now agreed with BC maintainer (cherry picked from commit c50bf623dd894b82d48379baacb8b74de52a9087) Bug: 27061541 Change-Id: Idac385bc5101d1b744b70ee4a1d26682df348003 --- .../org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java | 1 - 1 file changed, 1 deletion(-) (limited to 'bcprov/src/main') 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 da2b4d56..a1f05b4a 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 @@ -539,7 +539,6 @@ public class BaseBlockCipher { // BEGIN android-added if (((PBEKey)k).getSalt() == null) { - // TODO(27061541): check whether this is the correct fix throw new InvalidAlgorithmParameterException("Parameters for the algorithm are null " + "and the PBEKey has null salt"); } -- cgit v1.2.3