[svn] GnuPG - r4456 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2007-03-10 03:05:54 +0100 (Sat, 10 Mar 2007)
New Revision: 4456

Modified:
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
   trunk/g10/parse-packet.c
Log:
>From STABLE-BRANCH-1-4

* parse-packet.c (parse_signature): It's hex.

* getkey.c (merge_selfsigs_subkey): Avoid listing the contents of a
backsig when list mode is on.  Noted by Timo Schulz.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-03-08 18:31:56 UTC (rev 4455)
+++ trunk/g10/ChangeLog	2007-03-10 02:05:54 UTC (rev 4456)
@@ -1,3 +1,12 @@
+2007-03-09  David Shaw  <dshaw at jabberwocky.com>
+
+	From STABLE-BRANCH-1-4
+
+	* parse-packet.c (parse_signature): It's hex.
+
+	* getkey.c (merge_selfsigs_subkey): Avoid listing the contents of
+	a backsig when list mode is on.  Noted by Timo Schulz.
+
 2007-03-08  Werner Koch  <wk at g10code.com>
 
 	* plaintext.c (handle_plaintext): Add two extra fflush for stdout.

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2007-03-08 18:31:56 UTC (rev 4455)
+++ trunk/g10/getkey.c	2007-03-10 02:05:54 UTC (rev 4456)
@@ -2179,6 +2179,7 @@
 	  {
 	    PKT_signature *backsig=xmalloc_clear(sizeof(PKT_signature));
 	    IOBUF backsig_buf=iobuf_temp_with_content(p,n);
+	    int save_mode=set_packet_list_mode(0);
 
 	    if(parse_signature(backsig_buf,PKT_SIGNATURE,n,backsig)==0)
 	      {
@@ -2188,6 +2189,8 @@
 		  subpk->backsig=1;
 	      }
 
+	    set_packet_list_mode(save_mode);
+
 	    iobuf_close(backsig_buf);
 	    free_seckey_enc(backsig);
 	  }

Modified: trunk/g10/parse-packet.c
===================================================================
--- trunk/g10/parse-packet.c	2007-03-08 18:31:56 UTC (rev 4455)
+++ trunk/g10/parse-packet.c	2007-03-10 02:05:54 UTC (rev 4456)
@@ -1474,7 +1474,7 @@
 
     if( list_mode ) {
 	fprintf (listfp, ":signature packet: algo %d, keyid %08lX%08lX\n"
-	       "\tversion %d, created %lu, md5len %d, sigclass %02x\n"
+	       "\tversion %d, created %lu, md5len %d, sigclass 0x%02x\n"
 	       "\tdigest algo %d, begin of digest %02x %02x\n",
 		sig->pubkey_algo,
 		(ulong)sig->keyid[0], (ulong)sig->keyid[1],