security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

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

Browse Source 
--edit-key interface as well.
This commit is contained in:
David Shaw 2003-07-20 17:09:43 +00:00
parent 726b36b647
commit fa0cc6602b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2003-07-20 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (show_key_with_all_names): Use list-option
show-validity in --edit-key interface as well.
2003-07-19 David Shaw <dshaw@jabberwocky.com> 2003-07-19 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), mainproc.c (check_sig_and_print): Add * options.h, g10.c (main), mainproc.c (check_sig_and_print): Add

8
g10/keyedit.c
View File

@ -1980,6 +1980,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
int i, rc; int i, rc;
int do_warn = 0; int do_warn = 0;
byte pk_version=0; byte pk_version=0;
PKT_public_key *primary=NULL;
if (opt.with_colons) if (opt.with_colons)
{ {
@ -2010,6 +2011,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
} }
pk_version=pk->version; pk_version=pk->version;
primary=pk;
} }
if(with_revoker) { if(with_revoker) {
@ -2095,6 +2097,9 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
g10_errstr(rc) ); g10_errstr(rc) );
} }
} }
assert(primary);
/* the user ids */ /* the user ids */
i = 0; i = 0;
for( node = keyblock; node; node = node->next ) { for( node = keyblock; node; node = node->next ) {
@ -2102,6 +2107,9 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
PKT_user_id *uid = node->pkt->pkt.user_id; PKT_user_id *uid = node->pkt->pkt.user_id;
++i; ++i;
if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){ if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){
if(opt.list_options&LIST_SHOW_VALIDITY)
tty_printf("[%8.8s] ",
trust_value_to_string(get_validity(primary,uid)));
if( only_marked ) if( only_marked )
tty_printf(" "); tty_printf(" ");
else if( node->flag & NODFLG_SELUID ) else if( node->flag & NODFLG_SELUID )