security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Print the decoded iteration count with --list-packets.

Browse Source 
Fixes bug#1355.
This commit is contained in:
Werner Koch 2011-07-22 13:56:14 +02:00
parent 5a4071a273
commit 3d99d3f5db
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2011-07-22 Werner Koch <wk@g10code.com>
* parse-packet.c (parse_key): Print the decoded iteration count.
Fixes bug#1355.
2011-07-01 Werner Koch <wk@g10code.com> 2011-07-01 Werner Koch <wk@g10code.com>
* keyid.c (pubkey_letter): Add letters e and E. * keyid.c (pubkey_letter): Add letters e and E.

6
g10/parse-packet.c
View File

@ -1899,8 +1899,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
sk->protect.s2k.count = iobuf_get(inp); sk->protect.s2k.count = iobuf_get(inp);
pktlen--; pktlen--;
if( list_mode ) if( list_mode )
fprintf (listfp, "\tprotect count: %lu\n", fprintf (listfp, "\tprotect count: %lu (%lu)\n",
(ulong)sk->protect.s2k.count); (ulong)S2K_DECODE_COUNT
((ulong)sk->protect.s2k.count),
(ulong)sk->protect.s2k.count);
} }
else if( sk->protect.s2k.mode == 1002 ) { else if( sk->protect.s2k.mode == 1002 ) {
/* Read the serial number. */ /* Read the serial number. */