security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

Remove the default keyserver.

Browse Source
This commit is contained in:
Werner Koch 2025-01-08 18:19:49 +01:00
parent a04c936096
commit a2f2523b99
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -19,6 +19,7 @@ Noteworthy changes in version 2.5.3 (unreleased)
renamed to --deprecated-supervised as preparation for their renamed to --deprecated-supervised as preparation for their
removal. [rGa019a0fcd8] removal. [rGa019a0fcd8]
* There is no more default for a keyserver.
See-also: gnupg-announce/2024q4/000xxx.html See-also: gnupg-announce/2024q4/000xxx.html
Release-info: https://dev.gnupg.org/T7442 Release-info: https://dev.gnupg.org/T7442

2
configure.ac
View File

@ -1930,7 +1930,7 @@ AC_DEFINE_UNQUOTED(TPM2DAEMON_SOCK_NAME, "S.tpm2daemon",
AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr", AC_DEFINE_UNQUOTED(DIRMNGR_SOCK_NAME, "S.dirmngr",
[The name of the dirmngr socket]) [The name of the dirmngr socket])
AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER, AC_DEFINE_UNQUOTED(DIRMNGR_DEFAULT_KEYSERVER,
"hkps://keyserver.ubuntu.com", "hkps://none",
[The default keyserver for dirmngr to use, if none is explicitly given]) [The default keyserver for dirmngr to use, if none is explicitly given])
AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix]) AC_DEFINE_UNQUOTED(GPGEXT_GPG, "gpg", [The standard binary file suffix])

6
dirmngr/server.c
View File

@ -2209,8 +2209,10 @@ ensure_keyserver (ctrl_t ctrl)
if (!opt.keyserver) if (!opt.keyserver)
{ {
/* No global option set. Fall back to default: */ /* No global option set. Fall back to default: */
return make_keyserver_item (DIRMNGR_DEFAULT_KEYSERVER, /* return make_keyserver_item (DIRMNGR_DEFAULT_KEYSERVER, */
&ctrl->server_local->keyservers); /* &ctrl->server_local->keyservers); */
err = gpg_error (GPG_ERR_NO_KEYSERVER); /* No more default. */
goto leave;
} }
for (sl = opt.keyserver; sl; sl = sl->next) for (sl = opt.keyserver; sl; sl = sl->next)

4
doc/dirmngr.texi
View File

@ -345,9 +345,7 @@ service (.onion), Dirmngr selects the keyserver to use depending on
whether Tor is locally running or not. The check for a running Tor is whether Tor is locally running or not. The check for a running Tor is
done for each new connection. done for each new connection.
If no keyserver is explicitly configured, dirmngr will use the There is no default keyserver since version 2.5.3.
built-in default of @code{https://keyserver.ubuntu.com}. To avoid the
use of a default keyserver the value @code{none} can be used.
Windows users with a keyserver running on their Active Directory Windows users with a keyserver running on their Active Directory
may use the short form @code{ldap:///} for @var{name} to access this directory. may use the short form @code{ldap:///} for @var{name} to access this directory.