diff options
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 9dd55a1a4..0c8277a02 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -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); |