security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* parse-packet.c (parse_symkeyenc): Show the unpacked as well as the

Browse source 
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.
This commit is contained in:
David Shaw 2006-10-13 04:06:24 +00:00
parent 43825e9dae
commit c6465b0654
6 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
g10/passphrase.c
View file

@ -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;
}