security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-11 18:01:03 +02:00
Code Activity

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

Browse Source 
* getkey.c (merge_selfsigs_subkey): Avoid listing the contents of a
backsig when list mode is on.  Noted by Timo Schulz.
This commit is contained in:
David Shaw 2007-02-14 03:41:24 +00:00
parent 22be39dfac
commit 6b086c1fe3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2007-02-13 David Shaw <dshaw@jabberwocky.com>
* 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 <wk@g10code.com> 2007-02-04 Werner Koch <wk@g10code.com>
* parse-packet.c (parse_signature): Limit bytes read for an * parse-packet.c (parse_signature): Limit bytes read for an

3
g10/getkey.c
View File

@ -2169,6 +2169,7 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
{ {
PKT_signature *backsig=xmalloc_clear(sizeof(PKT_signature)); PKT_signature *backsig=xmalloc_clear(sizeof(PKT_signature));
IOBUF backsig_buf=iobuf_temp_with_content(p,n); 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) if(parse_signature(backsig_buf,PKT_SIGNATURE,n,backsig)==0)
{ {
@ -2178,6 +2179,8 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
subpk->backsig=1; subpk->backsig=1;
} }
set_packet_list_mode(save_mode);
iobuf_close(backsig_buf); iobuf_close(backsig_buf);
free_seckey_enc(backsig); free_seckey_enc(backsig);
} }

2
g10/parse-packet.c
View File

@ -1424,7 +1424,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
if( list_mode ) { if( list_mode ) {
fprintf (listfp, ":signature packet: algo %d, keyid %08lX%08lX\n" 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", "\tdigest algo %d, begin of digest %02x %02x\n",
sig->pubkey_algo, sig->pubkey_algo,
(ulong)sig->keyid[0], (ulong)sig->keyid[1], (ulong)sig->keyid[0], (ulong)sig->keyid[1],