security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* keylist.c (list_keyblock_print): Don't dump attribs for

Browse Source 
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:
David Shaw 2003-05-20 20:51:35 +00:00
parent 7df1d684d9
commit d5afcca57f
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/ChangeLog
View File

@ -1,3 +1,13 @@
2003-05-20 David Shaw <dshaw@jabberwocky.com>
* 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.
2003-05-11 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (parse_key): Clear disabled flag when parsing a

11
g10/keylist.c
View File

@ -367,13 +367,13 @@ print_capabilities (PKT_public_key *pk, PKT_secret_key *sk, KBNODE keyblock)
putchar(':');
}
static void dump_attribs(const PKT_user_id *uid,
PKT_public_key *pk,PKT_secret_key *sk)
void
dump_attribs(const PKT_user_id *uid,PKT_public_key *pk,PKT_secret_key *sk)
{
int i;
if(!attrib_fp)
BUG();
return;
for(i=0;i<uid->numattribs;i++)
{
@ -449,8 +449,6 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL)
dump_attribs(node->pkt->pkt.user_id,pk,sk);
/* don't list revoked or expired UIDS unless we are in
* verbose mode and signature listing has not been
* requested */
@ -459,6 +457,9 @@ list_keyblock_print ( KBNODE keyblock, int secret, int fpr, void *opaque )
node->pkt->pkt.user_id->is_expired ))
continue;
if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL)
dump_attribs(node->pkt->pkt.user_id,pk,sk);
if( any )
printf("uid%*s", 28, "");

2
g10/main.h
View File

@ -201,6 +201,8 @@ void list_keyblock( KBNODE keyblock, int secret, int fpr, void *opaque );
void print_fingerprint (PKT_public_key *pk, PKT_secret_key *sk, int mode);
void show_policy_url(PKT_signature *sig,int indent);
void show_notation(PKT_signature *sig,int indent);
void dump_attribs(const PKT_user_id *uid,
PKT_public_key *pk,PKT_secret_key *sk);
void set_attrib_fd(int fd);
/*-- verify.c --*/

17
g10/mainproc.c
View File

@ -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);
}
}