diff options
| author | David Shaw <[email protected]> | 2007-03-10 02:05:54 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-03-10 02:05:54 +0000 |
| commit | dd38a04f16bb247af9988c39e7628e4a8cd01530 (patch) | |
| tree | e28039f927010eed14e1234a2af8bc8d5c21a245 /g10/getkey.c | |
| parent | Add new logo. (diff) | |
| download | gnupg-dd38a04f16bb247af9988c39e7628e4a8cd01530.tar.gz gnupg-dd38a04f16bb247af9988c39e7628e4a8cd01530.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); } |