0905c56a1b
- Accept key updates even without UIDs [bsc#1143158] - Add patches: * gnupg-allow-import-of-previously-known-keys-even-without-UIDs.patch * gnupg-accept_subkeys_with_a_good_revocation_but_no_self-sig_during_import.patch * gnupg-add-test-cases-for-import-without-uid.patch OBS-URL: https://build.opensuse.org/request/show/762902 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=241
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From f361141a44365ff7db2d2cfbf118d5b54b52c3d5 Mon Sep 17 00:00:00 2001
|
|
From: Vincent Breitmoser <look@my.amazin.horse>
|
|
Date: Thu, 13 Jun 2019 21:27:43 +0200
|
|
Subject: [PATCH] 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>
|
|
---
|
|
g10/import.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/g10/import.c b/g10/import.c
|
|
index 2be214e63..ae2453803 100644
|
|
--- a/g10/import.c
|
|
+++ b/g10/import.c
|
|
@@ -3536,6 +3536,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
|