security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Print decoded S2K count in --list-packets mode. 

Fixes bug#1355.
This commit is contained in:
Werner Koch 2011-07-18 10:57:33 +02:00
parent 550d94b011
commit a74d5e3550
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
g10/ChangeLog
View File

@ -1,3 +1,16 @@
2011-07-18 Werner Koch <wk@g10code.com>
* parse-packet.c (parse_key): Print the decoded iteration count.
Fixes bug#1355.
2011-07-07 Werner Koch <wk@g10code.com>
* card-util.c (ask_card_keysize): Bump key size limit to 4096.
* call-agent.c (scd_genkey_parm_s): New.
(agent_scd_genkey): Use new struct.
(scd_genkey_cb): Implement chunked mode for KEY-DATA.
(scd_genkey_cb_append_savedbytes): New.
2011-06-16 Werner Koch <wk@g10code.com>
* card-util.c (ask_card_keysize): Bump key size limit to 4096.

3
g10/parse-packet.c
View File

@ -2152,7 +2152,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
ski->s2k.count = iobuf_get (inp);
pktlen--;
if (list_mode)
es_fprintf (listfp, "\tprotect count: %lu\n",
es_fprintf (listfp, "\tprotect count: %lu (%lu)\n",
(ulong)S2K_DECODE_COUNT ((ulong)ski->s2k.count),
(ulong) ski->s2k.count);
}
else if (ski->s2k.mode == 1002)