aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-05-29 05:53:28 -0400
committerJack Lloyd <[email protected]>2017-05-29 05:53:28 -0400
commitf1343ae9eceb3cc3aed1331a27b397f975ae84c3 (patch)
treec89516fd8c5260053669a83410c61cc3516fd95e /src/tests
parentfd6e6d8ed957e081b03072661f632679035c317f (diff)
Avoid infinite loop in PGP-S2K
In simple mode (no salt) with an empty password the input buffer is empty. Add a check that salt is not empty if iterations > 1 since PGP only has simple, salted, and iterated+salted modes.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/data/pbkdf/pgp_s2k.vec5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tests/data/pbkdf/pgp_s2k.vec b/src/tests/data/pbkdf/pgp_s2k.vec
index 21bac5343..0335be8a0 100644
--- a/src/tests/data/pbkdf/pgp_s2k.vec
+++ b/src/tests/data/pbkdf/pgp_s2k.vec
@@ -3,6 +3,11 @@
Salt =
Iterations = 1
+Passphrase =
+Output = DA39A3EE5E6B
+
+Salt =
+Iterations = 1
Passphrase = hello
Output = AAF4C61D