diff options
| author | David Shaw <[email protected]> | 2006-10-13 04:06:24 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-10-13 04:06:24 +0000 |
| commit | c6465b0654ed67602cdd465b4a945280877c40ae (patch) | |
| tree | 059ed0d8bf110c4d1378403cbe0b925a01590810 /g10/parse-packet.c | |
| parent | Allow pkcs#10 creation directkly from a smart card (diff) | |
| download | gnupg-c6465b0654ed67602cdd465b4a945280877c40ae.tar.gz gnupg-c6465b0654ed67602cdd465b4a945280877c40ae.zip | |
* 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.
Diffstat (limited to 'g10/parse-packet.c')
| -rw-r--r-- | g10/parse-packet.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 691f6696c..5b8f2de64 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -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"); } } |