[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-74-ga74d5e3

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  a74d5e355037f9445de39b21eef3e429749e5365 (commit)
      from  550d94b0113bfa49d7107171e498d16880deb5b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a74d5e355037f9445de39b21eef3e429749e5365
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 18 10:57:33 2011 +0200

    Print decoded S2K count in --list-packets mode.
    
    Fixes bug#1355.

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 2f107eb..4edbf23 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,16 @@
+2011-07-18  Werner Koch  <wk at g10code.com>
+
+	* parse-packet.c (parse_key): Print the decoded iteration count.
+	Fixes bug#1355.
+
+2011-07-07  Werner Koch  <wk at 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 at g10code.com>
 
 	* 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 50786eb..9c04362 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)

-----------------------------------------------------------------------

Summary of changes:
 g10/ChangeLog      |   13 +++++++++++++
 g10/parse-packet.c |    3 ++-
 2 files changed, 15 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org