aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-09-06 20:40:59 +0000
committerNeal H. Walfield <[email protected]>2016-09-06 20:40:59 +0000
commit13ddc17ddb266d74033d5739fec932034fa85c72 (patch)
tree6e087b5a1ed153cb9fa72acbfc92e11f7ce0cded
parentg10: Tweak TOFU's verbosity. (diff)
downloadgnupg-13ddc17ddb266d74033d5739fec932034fa85c72.tar.gz
gnupg-13ddc17ddb266d74033d5739fec932034fa85c72.zip
g10: Make sure some functions are passed a primary key.
* g10/tofu.c (get_trust): Make sure the caller provides a primary key. (tofu_register_signature): Likewise. -- Signed-off-by: Neal H. Walfield <[email protected]>
Diffstat (limited to '')
-rw-r--r--g10/tofu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/tofu.c b/g10/tofu.c
index 0fda536c2..9e07d21ce 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2011,6 +2011,8 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
if (opt.batch)
may_ask = 0;
+ log_assert (keyid_cmp (pk_keyid (pk), pk->main_keyid) == 0);
+
/* Make sure _tofu_GET_TRUST_ERROR isn't equal to any of the trust
levels. */
log_assert (_tofu_GET_TRUST_ERROR != TRUST_UNKNOWN
@@ -2778,6 +2780,8 @@ tofu_register_signature (ctrl_t ctrl,
if (rc)
return rc;
+ log_assert (keyid_cmp (pk_keyid (pk), pk->main_keyid) == 0);
+
sig_digest = make_radix64_string (sig_digest_bin, sig_digest_bin_len);
fingerprint = hexfingerprint (pk, NULL, 0);