aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <[email protected]>2019-06-13 19:27:43 +0000
committerDaniel Kahn Gillmor <[email protected]>2019-07-20 18:16:20 +0000
commitb2605ad61451796db371590b33f207da3553c676 (patch)
treef3ddaf566f1cdbd0f384413bd6c1e753e64fa43e
parentgpg: allow import of previously known keys, even without UIDs (diff)
downloadgnupg-b2605ad61451796db371590b33f207da3553c676.tar.gz
gnupg-b2605ad61451796db371590b33f207da3553c676.zip
gpg: accept subkeys with a good revocation but no self-sig during import
* g10/import.c (chk_self_sigs): Set the NODE_GOOD_SELFSIG flag when we encounter a valid revocation signature. This allows import of subkey revocation signatures, even in the absence of a corresponding subkey binding signature. -- This fixes the remaining test in import-incomplete.scm. GnuPG-Bug-id: 4393 Signed-off-by: Daniel Kahn Gillmor <[email protected]> Gbp-Pq: Topic import-merge-without-userid Gbp-Pq: Name gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
-rw-r--r--g10/import.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c
index f9acf9527..9217911cb 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -3602,6 +3602,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
/* It's valid, so is it newer? */
if (sig->timestamp >= rsdate)
{
+ knode->flag |= NODE_GOOD_SELFSIG; /* Subkey is valid. */
if (rsnode)
{
/* Delete the last revocation sig since