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

* packet.h, parse-packet.c (setup_user_id), free-packet.c (free_user_id),

Browse source 
keydb.h, keyid.c (namehash_from_uid): New function to rmd160-hash the
contents of a user ID packet and cache it in the uid object.

* keylist.c (list_keyblock_colon): Use namehash in field 8 of uids.  Show
dates for creation (selfsig date), and expiration in fields 6 and 7.

* trustdb.c (get_validity, get_validity_counts, update_validity): Use new
namehash function rather than hashing it locally.
This commit is contained in:
David Shaw 2003-01-14 18:13:22 +00:00
parent 2a9bd94734
commit 773513c70b
8 changed files with 65 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

38
g10/keylist.c
View file

@ -752,38 +752,46 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
PKT_user_id *uid=node->pkt->pkt.user_id;
if(attrib_fp && node->pkt->pkt.user_id->attrib_data!=NULL)
dump_attribs(node->pkt->pkt.user_id,pk,sk);
/*
* Fixme: We need a is_valid flag here too
*/
if( any ) {
char *str=node->pkt->pkt.user_id->attrib_data?"uat":"uid";
if ( node->pkt->pkt.user_id->is_revoked )
printf("%s:r::::::::",str);
else if ( node->pkt->pkt.user_id->is_expired )
printf("%s:e::::::::",str);
int i;
char *str=uid->attrib_data?"uat":"uid";
if ( uid->is_revoked )
printf("%s:r::::",str);
else if ( uid->is_expired )
printf("%s:e::::",str);
else if ( opt.no_expensive_trust_checks ) {
printf("%s:::::::::",str);
printf("%s:::::",str);
}
else {
int uid_validity;
if( pk && !ulti_hack )
uid_validity=get_validity_info (pk,
node->pkt->pkt.user_id);
uid_validity=get_validity_info (pk, uid);
else
uid_validity = 'u';
printf("%s:%c::::::::",str,uid_validity);
printf("%s:%c::::",str,uid_validity);
}
printf("%s:",colon_strtime(uid->created));
printf("%s:",colon_strtime(uid->expiredate));
namehash_from_uid(uid);
for(i=0; i < 20; i++ )
printf("%02X",uid->namehash[i]);
printf("::");
}
if(node->pkt->pkt.user_id->attrib_data)
printf("%u %lu",
node->pkt->pkt.user_id->numattribs,
node->pkt->pkt.user_id->attrib_len);
if(uid->attrib_data)
printf("%u %lu",uid->numattribs,uid->attrib_len);
else
print_string( stdout, node->pkt->pkt.user_id->name,
node->pkt->pkt.user_id->len, ':' );
print_string(stdout,uid->name,uid->len, ':' );
putchar(':');
if (any)
putchar('\n');