diff options
| author | David Shaw <[email protected]> | 2004-10-04 01:17:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-04 01:17:27 +0000 |
| commit | 56fbde0f5ebc8bf4cd57e0544cfefb394572aaf9 (patch) | |
| tree | 9d453dce121217a02c8da8b203bd7a32c5324ed7 | |
| parent | post release preparations (diff) | |
| download | gnupg-56fbde0f5ebc8bf4cd57e0544cfefb394572aaf9.tar.gz gnupg-56fbde0f5ebc8bf4cd57e0544cfefb394572aaf9.zip | |
* keyedit.c (print_and_check_one_sig_colon): Fix bad keyids in colon
delsig output. Noted by Peter Palfrader. (show_prefs): Do not reference
missing selfsig. Noted by Alex Moroz.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/keyedit.c | 24 |
2 files changed, 21 insertions, 10 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index eb143f4cb..b4f8d919f 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2004-10-03 David Shaw <[email protected]> + + * keyedit.c (print_and_check_one_sig_colon): Fix bad keyids in + colon delsig output. Noted by Peter Palfrader. + (show_prefs): Do not reference missing selfsig. Noted by Alex + Moroz. + 2004-10-01 Werner Koch <[email protected]> * gpgv.c (i18n_init): Always use LC_ALL. diff --git a/g10/keyedit.c b/g10/keyedit.c index 0144b1eac..5a8182859 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -167,7 +167,7 @@ print_and_check_one_sig_colon( KBNODE keyblock, KBNODE node, if( sigrc != '?' || print_without_key ) { printf("sig:%c::%d:%08lX%08lX:%lu:%lu:", - sigrc,sig->pubkey_algo,(ulong)sig->keyid[1],(ulong)sig->keyid[2], + sigrc,sig->pubkey_algo,(ulong)sig->keyid[0],(ulong)sig->keyid[1], (ulong)sig->timestamp,(ulong)sig->expiredate); if(sig->trust_depth || sig->trust_value) @@ -1876,8 +1876,6 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose) if (verbose) { int any, des_seen=0, sha1_seen=0, uncomp_seen=0; - const byte *pref_ks; - size_t pref_ks_len; tty_printf (" "); tty_printf (_("Cipher: ")); @@ -1971,14 +1969,20 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose) } tty_printf("\n"); - pref_ks=parse_sig_subpkt(selfsig->hashed, - SIGSUBPKT_PREF_KS,&pref_ks_len); - if(pref_ks && pref_ks_len) + if(selfsig) { - tty_printf (" "); - tty_printf(_("Preferred keyserver: ")); - tty_print_utf8_string(pref_ks,pref_ks_len); - tty_printf("\n"); + const byte *pref_ks; + size_t pref_ks_len; + + pref_ks=parse_sig_subpkt(selfsig->hashed, + SIGSUBPKT_PREF_KS,&pref_ks_len); + if(pref_ks && pref_ks_len) + { + tty_printf (" "); + tty_printf(_("Preferred keyserver: ")); + tty_print_utf8_string(pref_ks,pref_ks_len); + tty_printf("\n"); + } } } else { |