diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/trustdb.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 09bc6f766..0d4e36799 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 4 15:32:20 CET 1999 Werner Koch <[email protected]> + + * trustdb.c (verify_key): Shortcut for ultimately trusted keys. + Sat Dec 4 12:30:28 CET 1999 Werner Koch <[email protected]> * pkclist.c (build_pk_list): Validate the trust using the namehash diff --git a/g10/trustdb.c b/g10/trustdb.c index 69e3936b0..472daf2c1 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -2082,8 +2082,12 @@ verify_key( int max_depth, TRUSTREC *drec, const char *namehash, if( !tree ) return TRUST_UNDEFINED; pv_result = propagate_validity( tree, tree, add_fnc, retflgs ); - if( namehash ) { + if( namehash && tree->n.k.validity != TRUST_ULTIMATE ) { /* find the matching user id. + * We don't do this here if the key is ultimately trusted; in + * this case there will be no lits od user IDs and frankly + * it doe not make sense to compare by the name if we do + * have the secret key. * fixme: the way we handle this is too inefficient */ TN ur; TRUSTREC rec; |