From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 13 Jun 2019 19:27:43 +0000 (+0200)
Subject: gpg: accept subkeys with a good revocation but no self-sig during import
X-Git-Tag: archive/raspbian/2.2.12-1+rpi1+deb10u2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9e2f51d04320c11b39ec4773c0e2bb6fc3fd3743;p=gnupg2.git

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 <dkg@fifthhorseman.net>

Gbp-Pq: Topic import-merge-without-userid
Gbp-Pq: Name gpg-accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
---

diff --git a/g10/import.c b/g10/import.c
index cddb7c2..cf978e8 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -3619,6 +3619,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