security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

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

Browse Source 
Fixes bug#1355.
This commit is contained in:
Werner Koch 2011-07-22 14:00:08 +02:00
parent 6daa9dbd7c
commit 4fb59b1313
2 changed files with 20 additions and 13 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-04-05 David Shaw <dshaw@jabberwocky.com> 2011-04-05 David Shaw <dshaw@jabberwocky.com>
* photoid.c (generate_photo_id): Check for the JPEG magic numbers * photoid.c (generate_photo_id): Check for the JPEG magic numbers

6
g10/parse-packet.c
View File

@ -1831,8 +1831,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. */