diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/keyedit.c | 24 |
2 files changed, 19 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 06221be8b..c683455be 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2003-08-29 David Shaw <[email protected]> + * 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 show-long-keyid in --edit-key "check" function. diff --git a/g10/keyedit.c b/g10/keyedit.c index bd6b5fcf2..5b6f4f9df 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -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"), - node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub", - (node->flag & NODFLG_SELKEY)? '*':' ', - nbits_from_pk( pk ), - pubkey_letter( pk->pubkey_algo ), - (ulong)keyid_from_pk(pk,NULL), - datestr_from_pk(pk), - expirestr_from_pk(pk) ); + keyid_from_pk(pk,NULL); + tty_printf("%s%c %4u%c/", + node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub", + (node->flag & NODFLG_SELKEY)? '*':' ', + nbits_from_pk( pk ), + pubkey_letter( pk->pubkey_algo )); + + 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"); if( node->pkt->pkttype == PKT_PUBLIC_KEY ) { tty_printf(" "); + if(opt.list_options&LIST_SHOW_LONG_KEYID) + tty_printf(" "); tty_printf(_("trust: %-13s"), otrust); tty_printf(_("validity: %s"), trust ); tty_printf("\n"); |