From 8f2671d2cc022af2f564e296bdeb3bb2d2734ef4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 31 Mar 2017 20:03:52 +0200 Subject: gpg: Pass CTRL to many more functions. -- For proper operations as a server we need to avoid global variables. Thus we need to pass the session state CTRL to most functions. Quite a lot of changes but fortunately straightforward to do. Signed-off-by: Werner Koch --- g10/keyid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'g10/keyid.c') diff --git a/g10/keyid.c b/g10/keyid.c index 1d3f46cb4..24a56433b 100644 --- a/g10/keyid.c +++ b/g10/keyid.c @@ -538,7 +538,8 @@ keyid_from_pk (PKT_public_key *pk, u32 *keyid) * keys, but has to do a keylookup for old stayle keys. */ u32 -keyid_from_fingerprint( const byte *fprint, size_t fprint_len, u32 *keyid ) +keyid_from_fingerprint (ctrl_t ctrl, const byte *fprint, + size_t fprint_len, u32 *keyid) { u32 dummy_keyid[2]; @@ -552,7 +553,7 @@ keyid_from_fingerprint( const byte *fprint, size_t fprint_len, u32 *keyid ) int rc; memset (&pk, 0, sizeof pk); - rc = get_pubkey_byfprint (&pk, NULL, fprint, fprint_len); + rc = get_pubkey_byfprint (ctrl, &pk, NULL, fprint, fprint_len); if( rc ) { log_error("Oops: keyid_from_fingerprint: no pubkey\n"); -- cgit v1.2.3