aboutsummaryrefslogtreecommitdiffstats
path: root/g10/photoid.c
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-11-23 11:29:22 +0000
committerNeal H. Walfield <[email protected]>2016-11-23 11:29:22 +0000
commit03a65a53231cc3132a50a1871e81a512c44da169 (patch)
tree5df81cf4f7fbeaeb24801c5acebd6ce3160e2adf /g10/photoid.c
parentg10: Use es_fopen instead of open. (diff)
downloadgnupg-03a65a53231cc3132a50a1871e81a512c44da169.tar.gz
gnupg-03a65a53231cc3132a50a1871e81a512c44da169.zip
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 <[email protected]> GnuPG-bug-id: 2812
Diffstat (limited to 'g10/photoid.c')
-rw-r--r--g10/photoid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/photoid.c b/g10/photoid.c
index b61ed1bcd..8b193b3d4 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -304,7 +304,7 @@ show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
memset (&args, 0, sizeof(args));
args.pk = pk;
- args.validity_info = get_validity_info (ctrl, pk, uid);
+ args.validity_info = get_validity_info (ctrl, NULL, pk, uid);
args.validity_string = get_validity_string (ctrl, pk, uid);
namehash_from_uid (uid);
args.namehash = uid->namehash;