1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

* 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.
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

View file

@ -775,7 +775,9 @@ parse_symkeyenc( IOBUF inp, int pkttype, unsigned long pktlen, PACKET *packet )
for(i=0; i < 8; i++ )
fprintf (listfp, "%02x", k->s2k.salt[i]);
if( s2kmode == 3 )
fprintf (listfp, ", count %lu", (ulong)k->s2k.count );
fprintf (listfp, ", count %lu (%lu)",
S2K_DECODE_COUNT((ulong)k->s2k.count),
(ulong)k->s2k.count );
fprintf (listfp, "\n");
}
}