From 03a65a53231cc3132a50a1871e81a512c44da169 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 23 Nov 2016 12:29:22 +0100 Subject: g10: Avoid gratuitously loading a keyblock when it is already available * g10/trust.c (get_validity): Add new, optional parameter KB. Only load the keyblock if KB is NULL. Update callers. (get_validity): Likewise. * g10/trustdb.c (tdb_get_validity_core): Likewise. -- Signed-off-by: Neal H. Walfield GnuPG-bug-id: 2812 --- g10/getkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'g10/getkey.c') diff --git a/g10/getkey.c b/g10/getkey.c index f0e33c596..68e6a1bf0 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1543,7 +1543,7 @@ pubkey_cmp (ctrl_t ctrl, const char *name, struct pubkey_cmp_cookie *old, new->uid = scopy_user_id (uid); new->validity = - get_validity (ctrl, &new->key, uid, NULL, 0) & TRUST_MASK; + get_validity (ctrl, new_keyblock, &new->key, uid, NULL, 0) & TRUST_MASK; new->valid = 1; if (! old->valid) -- cgit v1.2.3