From c6465b0654ed67602cdd465b4a945280877c40ae Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 13 Oct 2006 04:06:24 +0000 Subject: * parse-packet.c (parse_symkeyenc): Show the unpacked as well as the packed s2k iteration count. * main.h, options.h, gpg.c (encode_s2k_iterations, main), passphrase.c (hash_passphrase): Add --s2k-count option to specify the number of s2k hash iterations. --- g10/passphrase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/passphrase.c') diff --git a/g10/passphrase.c b/g10/passphrase.c index b156d8f27..744da06ba 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -88,12 +88,12 @@ hash_passphrase ( DEK *dek, char *pw, STRING2KEY *s2k, int create ) { gcry_randomize (s2k->salt, 8, GCRY_STRONG_RANDOM); if ( s2k->mode == 3 ) - s2k->count = 96; /* 65536 iterations. */ + s2k->count = opt.s2k_count; } if ( s2k->mode == 3 ) { - count = (16ul + (s2k->count & 15)) << ((s2k->count >> 4) + 6); + count = S2K_DECODE_COUNT(s2k->count); if ( count < len2 ) count = len2; } -- cgit v1.2.3