diff options
| author | Sergio Giro <sgiro@google.com> | 2016-03-18 11:41:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-18 11:41:48 +0000 |
| commit | a0a650014dbdf5bceb822720674770e6e939b455 (patch) | |
| tree | 6de4cc7066001ab01983735d5e130be6dbe5a841 /bcprov/src/main | |
| parent | 6f9e4b2dd27c8de02b5bfc001dd7ca82fe4ada0b (diff) | |
| parent | 6981e03557b33c1682f50ab76348cafaf0bfe38e (diff) | |
| download | bouncycastle-a0a650014dbdf5bceb822720674770e6e939b455.tar.gz | |
Merge "BaseBlockCipher: removed TODO about checking a fix" into nyc-dev
Diffstat (limited to 'bcprov/src/main')
| -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 eec06f31..9fdbafd1 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"); } |