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

* keyedit.c (print_and_check_one_sig_colon): Fix bad keyids in colon

Browse Source 
delsig output.  Noted by Peter Palfrader. (show_prefs): Do not reference
missing selfsig.  Noted by Alex Moroz.
This commit is contained in:
David Shaw 2004-10-04 01:17:27 +00:00
parent 61a2afe554
commit 56fbde0f5e
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2004-10-03 David Shaw <dshaw@jabberwocky.com>
* 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 <wk@g10code.com> 2004-10-01 Werner Koch <wk@g10code.com>
* gpgv.c (i18n_init): Always use LC_ALL. * gpgv.c (i18n_init): Always use LC_ALL.

24
g10/keyedit.c
View File

@ -167,7 +167,7 @@ print_and_check_one_sig_colon( KBNODE keyblock, KBNODE node,
if( sigrc != '?' || print_without_key ) if( sigrc != '?' || print_without_key )
{ {
printf("sig:%c::%d:%08lX%08lX:%lu:%lu:", 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); (ulong)sig->timestamp,(ulong)sig->expiredate);
if(sig->trust_depth || sig->trust_value) if(sig->trust_depth || sig->trust_value)
@ -1876,8 +1876,6 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)
if (verbose) { if (verbose) {
int any, des_seen=0, sha1_seen=0, uncomp_seen=0; int any, des_seen=0, sha1_seen=0, uncomp_seen=0;
const byte *pref_ks;
size_t pref_ks_len;
tty_printf (" "); tty_printf (" ");
tty_printf (_("Cipher: ")); tty_printf (_("Cipher: "));
@ -1971,14 +1969,20 @@ show_prefs (PKT_user_id *uid, PKT_signature *selfsig, int verbose)
} }
tty_printf("\n"); tty_printf("\n");
pref_ks=parse_sig_subpkt(selfsig->hashed, if(selfsig)
SIGSUBPKT_PREF_KS,&pref_ks_len);
if(pref_ks && pref_ks_len)
{ {
tty_printf (" "); const byte *pref_ks;
tty_printf(_("Preferred keyserver: ")); size_t pref_ks_len;
tty_print_utf8_string(pref_ks,pref_ks_len);
tty_printf("\n"); 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 { else {