mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* keylist.c (list_keyblock_print): Don't dump attribs for
revoked/expired/etc uids for non-colon key listings. This is for consistency with --show-photos. * main.h, keylist.c (dump_attribs), mainproc.c (check_sig_and_print): Dump attribs if --attrib-fd is set when verifying signatures.
This commit is contained in:
parent
7df1d684d9
commit
d5afcca57f
4 changed files with 26 additions and 14 deletions
|
@ -1303,8 +1303,6 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
tstr = asctimestamp(sig->timestamp);
|
||||
astr = pubkey_algo_to_string( sig->pubkey_algo );
|
||||
|
@ -1421,9 +1419,14 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
!un->pkt->pkt.user_id->attrib_data )
|
||||
continue;
|
||||
|
||||
if(opt.show_photos && un->pkt->pkt.user_id->attrib_data)
|
||||
show_photos(un->pkt->pkt.user_id->attribs,
|
||||
un->pkt->pkt.user_id->numattribs,pk,NULL);
|
||||
if(un->pkt->pkt.user_id->attrib_data)
|
||||
{
|
||||
dump_attribs(un->pkt->pkt.user_id,pk,NULL);
|
||||
|
||||
if(opt.show_photos)
|
||||
show_photos(un->pkt->pkt.user_id->attribs,
|
||||
un->pkt->pkt.user_id->numattribs,pk,NULL);
|
||||
}
|
||||
|
||||
log_info( _(" aka \""));
|
||||
print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
|
||||
|
@ -1685,7 +1688,3 @@ proc_tree( CTX c, KBNODE node )
|
|||
dump_kbnode (node);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue