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

* mainproc.c (check_sig_and_print): Get the uid validity before printing

Browse source 
any sig results to avoid munging the output with trustdb warnings.

* g10.c (main): Don't include --show-keyring in --help as it is
deprecated.
This commit is contained in:
David Shaw 2003-08-24 23:01:26 +00:00
parent 5ad7dd7944
commit 03c12b5a5b
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/mainproc.c
View file

@ -1329,6 +1329,7 @@ check_sig_and_print( CTX c, KBNODE node )
/* find and print the primary user ID */
for( un=keyblock; un; un = un->next ) {
int valid;
if(un->pkt->pkttype==PKT_PUBLIC_KEY)
{
pk=un->pkt->pkt.public_key;
@ -1350,6 +1351,11 @@ check_sig_and_print( CTX c, KBNODE node )
assert(pk);
/* Get it before we print anything to avoid interrupting
the output with the "please do a --check-trustdb"
line. */
valid=get_validity(pk,un->pkt->pkt.user_id);
keyid_str[17] = 0; /* cut off the "[uncertain]" part */
write_status_text_and_buffer (statno, keyid_str,
un->pkt->pkt.user_id->name,
@ -1362,9 +1368,7 @@ check_sig_and_print( CTX c, KBNODE node )
print_utf8_string( log_stream(), un->pkt->pkt.user_id->name,
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)));
fprintf(log_stream(),"\" [%s]\n",trust_value_to_string(valid));
else
fputs("\"\n", log_stream() );
count++;