mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* armor.c (armor_filter): Comment about PGP's end of line tab problem.
* trustdb.h, trustdb.c (trust_letter): Make static. (get_ownertrust_info, get_validity_info): Don't mask the trust level twice. * trustdb.h, gpgv.c, trustdb.c (get_validity, get_validity_info), keylist.c (list_keyblock_colon), keyedit.c (show_key_with_all_names_colon, menu_revuid): Pass a user ID in rather than a namehash, so we only have to do the hashing in one place. * packet.h, pkclist.c (build_pk_list), free-packet.c (release_public_key_parts): Remove unused namehash element for public keys.
This commit is contained in:
parent
29ef9bd0fb
commit
8b3b70499a
10 changed files with 65 additions and 58 deletions
|
@ -1,5 +1,6 @@
|
|||
/* keylist.c
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
|
||||
* Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
@ -766,20 +767,11 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr )
|
|||
printf("%s:::::::::",str);
|
||||
}
|
||||
else {
|
||||
byte namehash[20];
|
||||
int uid_validity;
|
||||
|
||||
if( pk && !ulti_hack ) {
|
||||
if( node->pkt->pkt.user_id->attrib_data )
|
||||
rmd160_hash_buffer( namehash,
|
||||
node->pkt->pkt.user_id->attrib_data,
|
||||
node->pkt->pkt.user_id->attrib_len);
|
||||
else
|
||||
rmd160_hash_buffer( namehash,
|
||||
node->pkt->pkt.user_id->name,
|
||||
node->pkt->pkt.user_id->len );
|
||||
uid_validity = get_validity_info( pk, namehash );
|
||||
}
|
||||
if( pk && !ulti_hack )
|
||||
uid_validity=get_validity_info (pk,
|
||||
node->pkt->pkt.user_id);
|
||||
else
|
||||
uid_validity = 'u';
|
||||
printf("%s:%c::::::::",str,uid_validity);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue