diff options
author | NIIBE Yutaka <[email protected]> | 2016-08-04 07:21:39 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2016-08-04 08:14:26 +0000 |
commit | f474b161f6c8c7a3dc0fb90d25ffceacba1ff117 (patch) | |
tree | 1363da8102eae228c01c2f5d41203d0099a5eec7 | |
parent | Partially revert "g10: Fix another race condition for trustdb access." (diff) | |
download | gnupg-f474b161f6c8c7a3dc0fb90d25ffceacba1ff117.tar.gz gnupg-f474b161f6c8c7a3dc0fb90d25ffceacba1ff117.zip |
g10: Fix checking key for signature validation.
* g10/sig-check.c (signature_check2): Not only subkey, but also primary
key should have flags.valid=1.
--
(backport of master
commit 6f284e6ed63f514b15fe610f490ffcefc87a2164)
Signed-off-by: NIIBE Yutaka <[email protected]>
-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 6bac63034..8dd0373ab 100644 --- a/g10/sig-check.c +++ b/g10/sig-check.c @@ -76,9 +76,9 @@ signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate, } else if( get_pubkey( pk, sig->keyid ) ) rc = G10ERR_NO_PUBKEY; - else if(!pk->is_valid && !pk->is_primary) + else if(!pk->is_valid) rc=G10ERR_BAD_PUBKEY; /* you cannot have a good sig from an - invalid subkey */ + invalid key */ else { if(r_expiredate) |