diff options
| author | Sergio Giro <sgiro@google.com> | 2016-03-18 11:17:13 +0000 |
|---|---|---|
| committer | Sergio Giro <sgiro@google.com> | 2016-03-18 11:23:30 +0000 |
| commit | 6981e03557b33c1682f50ab76348cafaf0bfe38e (patch) | |
| tree | d4b6324cddd0dd071fd7e0eb686a11dda3cd8b0c | |
| parent | c8f9dc88f7b38016a48406ebbd76421439068860 (diff) | |
| download | android_external_bouncycastle-6981e03557b33c1682f50ab76348cafaf0bfe38e.tar.gz android_external_bouncycastle-6981e03557b33c1682f50ab76348cafaf0bfe38e.tar.bz2 android_external_bouncycastle-6981e03557b33c1682f50ab76348cafaf0bfe38e.zip | |
BaseBlockCipher: removed TODO about checking a fix
Fix was now agreed with BC maintainer
(cherry picked from commit c50bf623dd894b82d48379baacb8b74de52a9087)
Bug: 27061541
Change-Id: Idac385bc5101d1b744b70ee4a1d26682df348003
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java | 1 |
1 files changed, 0 insertions, 1 deletions
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..a1f05b4 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"); } |