Print decoded S2K count in --list-packets mode.
authorWerner Koch <wk@gnupg.org>
Mon, 18 Jul 2011 08:57:33 +0000 (10:57 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 18 Jul 2011 08:57:33 +0000 (10:57 +0200)
Fixes bug#1355.

g10/ChangeLog
g10/parse-packet.c

index 2f107eb..4edbf23 100644 (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.
index 50786eb..9c04362 100644 (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)