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/gpgv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'g10/gpgv.c') diff --git a/g10/gpgv.c b/g10/gpgv.c index da07989ea..0ecf232e2 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -292,19 +292,22 @@ check_trustdb_stale (ctrl_t ctrl) } int -get_validity_info (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid) +get_validity_info (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk, + PKT_user_id *uid) { (void)ctrl; + (void)kb; (void)pk; (void)uid; return '?'; } unsigned int -get_validity (ctrl_t ctrl, PKT_public_key *pk, PKT_user_id *uid, +get_validity (ctrl_t ctrl, kbnode_t kb, PKT_public_key *pk, PKT_user_id *uid, PKT_signature *sig, int may_ask) { (void)ctrl; + (void)kb; (void)pk; (void)uid; (void)sig; -- cgit v1.2.3