dirmngr: Don't add system CAs for SKS HKPS pool.
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 16 Jul 2019 01:10:52 +0000 (10:10 +0900)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 1 Jul 2022 16:06:43 +0000 (17:06 +0100)
* dirmngr/http.c [HTTP_USE_GNUTLS] (http_session_new): Clear
add_system_cas.

--

Cherry-picking the master commit of:
75e0ec65170b7053743406e3f3b605febcf7312a

GnuPG-bug-id: 4594
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 58e234fbeb6cc5908b69a73e50428f02e584e504)

Gbp-Pq: Topic from-2.2.18-prerelease
Gbp-Pq: Name dirmngr-Don-t-add-system-CAs-for-SKS-HKPS-pool.patch

dirmngr/http.c

index d2456c6dc912623a057dceb37fc93ebc6661b065..1ba8e79d2c8f5cd87f48486a01d4038f26c241e2 100644 (file)
@@ -791,6 +791,8 @@ http_session_new (http_session_t *r_session,
                         pemname, gnutls_strerror (rc));
             xfree (pemname);
           }
+
+        add_system_cas = 0;
       }
 
     /* Add configured certificates to the session.  */