aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-09-10 14:15:17 -0400
committerJack Lloyd <[email protected]>2018-09-10 14:15:17 -0400
commit70e428b2fce083c48fd7fa429476e3410eec1b6d (patch)
tree276501e1fcac90053d40722c311bee01109b7b6b /src
parent3731418d7f285d3de36ef31268d773bbbc83f599 (diff)
Remove redundant operation
Diffstat (limited to 'src')
-rw-r--r--src/lib/pubkey/pbes2/pbes2.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/pubkey/pbes2/pbes2.cpp b/src/lib/pubkey/pbes2/pbes2.cpp
index 995f93c47..263263843 100644
--- a/src/lib/pubkey/pbes2/pbes2.cpp
+++ b/src/lib/pubkey/pbes2/pbes2.cpp
@@ -114,10 +114,6 @@ secure_vector<uint8_t> derive_key(const std::string& passphrase,
const std::chrono::milliseconds msec(*msec_in_iterations_out);
pwhash = pwhash_fam->tune(key_length, msec);
}
- else if(iterations_if_msec_null <= 100000)
- {
- pwhash = pwhash_fam->default_params();
- }
else
{
pwhash = pwhash_fam->from_iterations(iterations_if_msec_null);