From d445e193652617a85a09289689a61111b889728f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 10 Jan 2022 09:13:43 +0100 Subject: [PATCH] dirmngr: Map all gnupg.net addresses to the Ubuntu keyserver. * dirmngr/server.c (make_keyserver_item): Change mapping. -- It turned out that having the old surfnet keyserver for unencrypted connections is problematic because that server does not sync with the Ubuntu server. GnuPG-bug-id: 5751 --- dirmngr/server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dirmngr/server.c b/dirmngr/server.c index ced92de21..65bc50fb4 100644 --- a/dirmngr/server.c +++ b/dirmngr/server.c @@ -2142,18 +2142,18 @@ make_keyserver_item (const char *uri, uri_item_t *r_item) else if (!strcmp (uri, "https://keys.gnupg.net")) uri = "hkps://keyserver.ubuntu.com"; else if (!strcmp (uri, "hkp://keys.gnupg.net")) - uri = "hkp://pgp.surf.nl"; + uri = "hkp://keyserver.ubuntu.com"; else if (!strcmp (uri, "http://keys.gnupg.net")) - uri = "hkp://pgp.surf.nl:80"; + uri = "hkp://keyserver.ubuntu.com:80"; else if (!strcmp (uri, "hkps://http-keys.gnupg.net") || !strcmp (uri, "http-keys.gnupg.net")) uri = "hkps://keyserver.ubuntu.com"; else if (!strcmp (uri, "https://http-keys.gnupg.net")) uri = "hkps://keyserver.ubuntu.com"; else if (!strcmp (uri, "hkp://http-keys.gnupg.net")) - uri = "hkp://pgp.surf.nl"; + uri = "hkp://keyserver.ubuntu.com"; else if (!strcmp (uri, "http://http-keys.gnupg.net")) - uri = "hkp://pgp.surf.nl:80"; + uri = "hkp://keyserver.ubuntu.com:80"; item = xtrymalloc (sizeof *item + strlen (uri)); if (!item)