security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-11 22:01:08 +02:00
Code Activity

* keyedit.c (show_key_with_all_names): Use list-option show-long-keyid in

Browse Source 
main --edit-key display.
This commit is contained in:
David Shaw 2003-08-30 01:08:08 +00:00
parent b9c223f86a
commit 7c352dc29e
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2003-08-29 David Shaw <dshaw@jabberwocky.com> 2003-08-29 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (show_key_with_all_names): Use list-option
show-long-keyid in main --edit-key display.
* keyedit.c (print_and_check_one_sig): Use list-option * keyedit.c (print_and_check_one_sig): Use list-option
show-long-keyid in --edit-key "check" function. show-long-keyid in --edit-key "check" function.

24
g10/keyedit.c
View File

@ -2047,19 +2047,27 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
} }
} }
tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"), keyid_from_pk(pk,NULL);
node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub", tty_printf("%s%c %4u%c/",
(node->flag & NODFLG_SELKEY)? '*':' ', node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
nbits_from_pk( pk ), (node->flag & NODFLG_SELKEY)? '*':' ',
pubkey_letter( pk->pubkey_algo ), nbits_from_pk( pk ),
(ulong)keyid_from_pk(pk,NULL), pubkey_letter( pk->pubkey_algo ));
datestr_from_pk(pk),
expirestr_from_pk(pk) ); if(opt.list_options&LIST_SHOW_LONG_KEYID)
tty_printf("%08lX",(ulong)pk->keyid[0]);
tty_printf("%08lX ",(ulong)pk->keyid[1]);
tty_printf(_("created: %s expires: %s"),
datestr_from_pk(pk),
expirestr_from_pk(pk) );
tty_printf("\n"); tty_printf("\n");
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) if( node->pkt->pkttype == PKT_PUBLIC_KEY )
{ {
tty_printf(" "); tty_printf(" ");
if(opt.list_options&LIST_SHOW_LONG_KEYID)
tty_printf(" ");
tty_printf(_("trust: %-13s"), otrust); tty_printf(_("trust: %-13s"), otrust);
tty_printf(_("validity: %s"), trust ); tty_printf(_("validity: %s"), trust );
tty_printf("\n"); tty_printf("\n");