security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* options.h, g10.c (main), mainproc.c (check_sig_and_print): Add

Browse source 
--verify-option show-unusable-uids.
This commit is contained in:
David Shaw 2003-09-30 21:16:36 +00:00
parent 3901d48afc
commit cb772decc4
4 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
g10/mainproc.c
View file

@ -1345,7 +1345,7 @@ check_sig_and_print( CTX c, KBNODE node )
continue;
if ( !un->pkt->pkt.user_id->is_primary )
continue;
/* We want the textual user ID here */
/* We want the textual primary user ID here */
if ( un->pkt->pkt.user_id->attrib_data )
continue;
@ -1417,10 +1417,10 @@ check_sig_and_print( CTX c, KBNODE node )
for( un=keyblock; un; un = un->next ) {
if( un->pkt->pkttype != PKT_USER_ID )
continue;
if ( un->pkt->pkt.user_id->is_revoked )
continue;
if ( un->pkt->pkt.user_id->is_expired )
continue;
if((un->pkt->pkt.user_id->is_revoked
|| un->pkt->pkt.user_id->is_expired)
&& !(opt.verify_options&VERIFY_SHOW_UNUSABLE_UIDS))
continue;
/* Only skip textual primaries */
if ( un->pkt->pkt.user_id->is_primary &&
!un->pkt->pkt.user_id->attrib_data )
@ -1440,10 +1440,18 @@ check_sig_and_print( CTX c, KBNODE node )
un->pkt->pkt.user_id->len );
if(opt.verify_options&VERIFY_SHOW_VALIDITY)
fprintf(log_stream(),"\" [%s]\n",
trust_value_to_string(get_validity(pk,
un->pkt->
pkt.user_id)));
{
const char *valid;
if(un->pkt->pkt.user_id->is_revoked)
valid=_("revoked");
else if(un->pkt->pkt.user_id->is_expired)
valid=_("expired");
else
valid=trust_value_to_string(get_validity(pk,
un->pkt->
pkt.user_id));
fprintf(log_stream(),"\" [%s]\n",valid);
}
else
fputs("\"\n", log_stream() );
}