diff options
| author | Werner Koch <[email protected]> | 2018-07-05 18:55:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-07-05 19:41:02 +0000 |
| commit | 221af19351addcdc28a1cd533c8628cfa3841671 (patch) | |
| tree | ed7e78a9e2fe29262f2e46495962926bccf52dee /g10/sig-check.c | |
| parent | po: Fix bug in german translation (diff) | |
| download | gnupg-221af19351addcdc28a1cd533c8628cfa3841671.tar.gz gnupg-221af19351addcdc28a1cd533c8628cfa3841671.zip | |
gpg: Prepare for signatures with ISSUER_FPR but without ISSUER.
* g10/getkey.c (get_pubkey_for_sig): New.
(get_pubkeyblock_for_sig): New.
* g10/mainproc.c (issuer_fpr_raw): Give global scope.
(check_sig_and_print): Use get_pubkeyblock_for_sig.
* g10/pkclist.c (check_signatures_trust): Use get_pubkey_for_sig.
* g10/sig-check.c (check_signature2): Ditto.
(check_signature_over_key_or_uid): Ditto.
--
GnuPG-bug-id: 4046
The whole getkey stuff is still a mess with way to much duplication
and missing caching of already fetched data.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit f7526c7bc754acf68bde0b79c785e875a9365d60)
Diffstat (limited to '')
| -rw-r--r-- | g10/sig-check.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c index 6b9feebfd..e59e0c900 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -156,7 +156,7 @@ check_signature2 (ctrl_t ctrl, log_info(_("WARNING: signature digest conflict in message\n")); rc = gpg_error (GPG_ERR_GENERAL); } - else if (get_pubkey (ctrl, pk, sig->keyid)) + else if (get_pubkey_for_sig (ctrl, pk, sig)) rc = gpg_error (GPG_ERR_NO_PUBKEY); else if (!gnupg_pk_is_allowed (opt.compliance, PK_USE_VERIFICATION, pk->pubkey_algo, pk->pkey, @@ -923,7 +923,7 @@ check_signature_over_key_or_uid (ctrl_t ctrl, PKT_public_key *signer, if (IS_CERT (sig)) signer->req_usage = PUBKEY_USAGE_CERT; - rc = get_pubkey (ctrl, signer, sig->keyid); + rc = get_pubkey_for_sig (ctrl, signer, sig); if (rc) { xfree (signer); |