diff options
| author | Werner Koch <[email protected]> | 2017-03-02 16:58:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-02 16:58:58 +0000 |
| commit | de6d8313f6df32aaa151bee74e1db269ac1e0fed (patch) | |
| tree | 676c6d8deb0a50597f8defa7bd518b5151ad518d /dirmngr/http-ntbtls.c | |
| parent | gpg: Always initialize the trust db when generating keys. (diff) | |
| download | gnupg-de6d8313f6df32aaa151bee74e1db269ac1e0fed.tar.gz gnupg-de6d8313f6df32aaa151bee74e1db269ac1e0fed.zip | |
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) <aGPGCongList>: Return default keyserver.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/http-ntbtls.c')
| -rw-r--r-- | dirmngr/http-ntbtls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dirmngr/http-ntbtls.c b/dirmngr/http-ntbtls.c index 00d6a58bf..d44b77930 100644 --- a/dirmngr/http-ntbtls.c +++ b/dirmngr/http-ntbtls.c @@ -26,12 +26,12 @@ #include "dirmngr.h" #include "certcache.h" #include "validate.h" +#include "misc.h" #ifdef HTTP_USE_NTBTLS # include <ntbtls.h> - /* The callback used to verify the peer's certificate. */ gpg_error_t gnupg_http_tls_verify_cb (void *opaque, @@ -77,11 +77,11 @@ gnupg_http_tls_verify_cb (void *opaque, validate_flags = VALIDATE_FLAG_TLS; - /* Are we using the standard hkps:// pool use the dedicated + /* If we are using the standard hkps:// pool use the dedicated * root certificate. */ hostname = ntbtls_get_hostname (tls); if (hostname - && !ascii_strcasecmp (hostname, "hkps.pool.sks-keyservers.net")) + && !ascii_strcasecmp (hostname, get_default_keyserver (1))) { validate_flags |= VALIDATE_FLAG_TRUST_HKPSPOOL; } |