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

* armor.c (armor_filter): Comment about PGP's end of line tab problem.

Browse source 
* 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:
David Shaw 2003-01-11 03:57:00 +00:00
parent 29ef9bd0fb
commit 8b3b70499a
10 changed files with 65 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

23
g10/keyedit.c
View file

@ -1,5 +1,6 @@
/* keyedit.c - keyedit stuff
* 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.
*
@ -1816,18 +1817,10 @@ show_key_with_all_names_colon (KBNODE keyblock)
printf("::::::::");
else
{
byte namehash[20];
int uid_validity;
if( primary && !ulti_hack )
{
if( uid->attrib_data )
rmd160_hash_buffer(namehash,
uid->attrib_data, uid->attrib_len);
else
rmd160_hash_buffer( namehash, uid->name, uid->len );
uid_validity = get_validity_info( primary, namehash );
}
uid_validity = get_validity_info( primary, uid );
else
uid_validity = 'u';
printf("%c::::::::",uid_validity);
@ -3407,8 +3400,6 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
}
else
{
byte namehash[20];
pkt = m_alloc_clear( sizeof *pkt );
pkt->pkttype = PKT_SIGNATURE;
pkt->pkt.signature = sig;
@ -3418,13 +3409,7 @@ menu_revuid( KBNODE pub_keyblock, KBNODE sec_keyblock )
{
/* If the trustdb has an entry for this key+uid then the
trustdb needs an update. */
if( uid->attrib_data )
rmd160_hash_buffer(namehash,
uid->attrib_data, uid->attrib_len);
else
rmd160_hash_buffer( namehash, uid->name, uid->len );
if((get_validity(pk,namehash)&TRUST_MASK)>=TRUST_UNDEFINED)
if((get_validity(pk,uid)&TRUST_MASK)>=TRUST_UNDEFINED)
update_trust=1;
}