diff options
| -rw-r--r-- | g10/ChangeLog | 13 | ||||
| -rw-r--r-- | g10/parse-packet.c | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 2f107eb5a..4edbf2362 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,16 @@ +2011-07-18 Werner Koch <[email protected]> + + * parse-packet.c (parse_key): Print the decoded iteration count. + Fixes bug#1355. + +2011-07-07 Werner Koch <[email protected]> + + * 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 <[email protected]> * card-util.c (ask_card_keysize): Bump key size limit to 4096. diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 50786eb08..9c0436231 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -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) |