summaryrefslogtreecommitdiffstats
path: root/g10/sig-check.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2016-08-04 09:21:39 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2016-08-04 09:21:39 +0200
commit6f284e6ed63f514b15fe610f490ffcefc87a2164 (patch)
tree036ab63de495067f671ab95d2d9191db4b9d3cb4 /g10/sig-check.c
parentReword feature description. (diff)
downloadgnupg2-6f284e6ed63f514b15fe610f490ffcefc87a2164.tar.xz
gnupg2-6f284e6ed63f514b15fe610f490ffcefc87a2164.zip
g10: Fix checking key for signature validation.
* g10/sig-check.c (check_signature2): Not only subkey, but also primary key should have flags.valid=1. -- The tweak of gpgv in e32c575e0f3704e7563048eea6d26844bdfc494b only makes sense with this change. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'g10/sig-check.c')
-rw-r--r--g10/sig-check.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 7000b480c..334add785 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -118,9 +118,9 @@ check_signature2 (PKT_signature *sig, gcry_md_hd_t digest, u32 *r_expiredate,
}
else if( get_pubkey( pk, sig->keyid ) )
rc = GPG_ERR_NO_PUBKEY;
- else if(!pk->flags.valid && !pk->flags.primary)
+ else if(!pk->flags.valid)
{
- /* You cannot have a good sig from an invalid subkey. */
+ /* You cannot have a good sig from an invalid key. */
rc = GPG_ERR_BAD_PUBKEY;
}
else