security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-07 22:01:07 +01:00
Code Activity

From STABLE-BRANCH-1-4

Browse Source 
* 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.
This commit is contained in:
David Shaw 2007-03-10 02:05:54 +00:00
parent 43a7d88e11
commit dd38a04f16
3 changed files with 13 additions and 1 deletions

9
g10/ChangeLog

@ -1,3 +1,12 @@
2007-03-09 David Shaw <dshaw@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@g10code.com> 2007-03-08 Werner Koch <wk@g10code.com>
* plaintext.c (handle_plaintext): Add two extra fflush for stdout. * plaintext.c (handle_plaintext): Add two extra fflush for stdout.

3
g10/getkey.c

@ -2179,6 +2179,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)
{ {
@ -2188,6 +2189,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

@ -1474,7 +1474,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],