diff options
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/getkey.c | 3 | ||||
| -rw-r--r-- | g10/parse-packet.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a5d017f92..3fa453348 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2007-03-09 David Shaw <[email protected]> + + 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 <[email protected]> * plaintext.c (handle_plaintext): Add two extra fflush for stdout. diff --git a/g10/getkey.c b/g10/getkey.c index 042046de1..658a3b4ae 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2179,6 +2179,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) { 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 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) subpk->backsig=1; } + set_packet_list_mode(save_mode); + iobuf_close(backsig_buf); free_seckey_enc(backsig); } diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 243523df6..5d5d14a56 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1474,7 +1474,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen, 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], |