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): Account for the extra space that

Browse Source 
show-sig-expire takes up so we do not wrap lines.
(show_key_with_all_names): No need to show subkey revocations as a
seperate line since we now show revocation date in the main subkey line.
This commit is contained in:
David Shaw 2004-09-29 03:21:05 +00:00
parent 793f8d8d55
commit c48d5ebbb7
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,5 +1,11 @@
2004-09-28 David Shaw <dshaw@jabberwocky.com> 2004-09-28 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (print_and_check_one_sig): Account for the extra space
that show-sig-expire takes up so we do not wrap lines.
(show_key_with_all_names): No need to show subkey revocations as a
seperate line since we now show revocation date in the main subkey
line.
* signal.c (got_fatal_signal): HAVE_DECL_SYS_SIGLIST is defined, * signal.c (got_fatal_signal): HAVE_DECL_SYS_SIGLIST is defined,
but zero if not found. Noted by John Clizbe. but zero if not found. Noted by John Clizbe.

19
g10/keyedit.c
View File

@ -257,7 +257,8 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
{ {
size_t n; size_t n;
char *p = get_user_id( sig->keyid, &n ); char *p = get_user_id( sig->keyid, &n );
tty_print_utf8_string2( p, n, opt.screen_columns-keystrlen()-26 ); tty_print_utf8_string2(p, n, opt.screen_columns-keystrlen()-26-
((opt.list_options&LIST_SHOW_SIG_EXPIRE)?11:0));
m_free(p); m_free(p);
} }
tty_printf("\n"); tty_printf("\n");
@ -2164,7 +2165,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
int with_fpr, int with_subkeys, int with_prefs ) int with_fpr, int with_subkeys, int with_prefs )
{ {
KBNODE node; KBNODE node;
int i, rc; int i;
int do_warn = 0, indent=0; int do_warn = 0, indent=0;
byte pk_version=0; byte pk_version=0;
PKT_public_key *primary=NULL; PKT_public_key *primary=NULL;
@ -2315,20 +2316,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
tty_printf ("\n"); tty_printf ("\n");
} }
} }
else if( with_subkeys && node->pkt->pkttype == PKT_SIGNATURE
&& node->pkt->pkt.signature->sig_class == 0x28 ) {
PKT_signature *sig = node->pkt->pkt.signature;
rc = check_key_signature( keyblock, node, NULL );
if( !rc )
tty_printf( _("rev! subkey has been revoked: %s\n"),
datestr_from_sig( sig ) );
else if( rc == G10ERR_BAD_SIGN )
tty_printf( _("rev- faked revocation found\n") );
else if( rc )
tty_printf( _("rev? problem checking revocation: %s\n"),
g10_errstr(rc) );
}
} }
/* the user ids */ /* the user ids */