From de6d8313f6df32aaa151bee74e1db269ac1e0fed Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 2 Mar 2017 17:58:00 +0100 Subject: dirmngr: Let --gpgconf-list return the default keyserver. * dirmngr/misc.c (get_default_keyserver): New. * dirmngr/http.c: Include misc.h (http_session_new): Use get_default_keyserver instead of hardwired "hkps.pool.sks-keyservers.net". * dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto. * dirmngr/dirmngr.c (main) : Return default keyserver. Signed-off-by: Werner Koch --- dirmngr/misc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'dirmngr/misc.c') diff --git a/dirmngr/misc.c b/dirmngr/misc.c index 6d7c963db..d2f1c69a6 100644 --- a/dirmngr/misc.c +++ b/dirmngr/misc.c @@ -30,6 +30,29 @@ #include "util.h" #include "misc.h" +/* Return a static string with the default keyserver. If NAME_ONLY is + * given only the name part is returned. */ +const char * +get_default_keyserver (int name_only) +{ + static const char *result; + + if (!name_only) + return DIRMNGR_DEFAULT_KEYSERVER; + + if (!result) + { + /* Strip the scheme from the constant. */ + result = strstr (DIRMNGR_DEFAULT_KEYSERVER, "://"); + log_assert (result && strlen (result) > 3); + result += 3; + /* Assert that there is no port given. */ + log_assert (strchr (result, ':')); + } + return result; +} + + /* Convert the hex encoded STRING back into binary and store the result into the provided buffer RESULT. The actual size of that -- cgit v1.2.3