diff options
| author | David Shaw <[email protected]> | 2007-02-14 03:41:24 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-02-14 03:41:24 +0000 |
| commit | 6b086c1fe363f223af8a2951bd73a63fa773a7f4 (patch) | |
| tree | a5849a8726905bed8526190ef7e86b3fc7364cf3 | |
| parent | * secmem.c (ptr_into_pool_p): New. (diff) | |
| download | gnupg-6b086c1fe363f223af8a2951bd73a63fa773a7f4.tar.gz gnupg-6b086c1fe363f223af8a2951bd73a63fa773a7f4.zip | |
* 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.
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/getkey.c | 3 | ||||
| -rw-r--r-- | g10/parse-packet.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e9632bb77..bf8c92cec 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2007-02-13 David Shaw <[email protected]> + + * 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-02-04 Werner Koch <[email protected]> * parse-packet.c (parse_signature): Limit bytes read for an diff --git a/g10/getkey.c b/g10/getkey.c index 74c0a74d6..b99ea234d 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2169,6 +2169,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) { @@ -2178,6 +2179,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 639115252..747a50f93 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1424,7 +1424,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], |