diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index b39447f00..19b553e2b 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -1,206 +1,207 @@
 # Makefile.am - dirmngr
 # Copyright (C) 2002 Klarälvdalens Datakonsult AB
 # Copyright (C) 2004, 2007, 2010 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #
 # GnuPG is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: GPL-3.0+
 
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
              dirmngr-w32info.rc dirmngr.w32-manifest.in \
              dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
              dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
 
 
 dist_pkgdata_DATA = sks-keyservers.netCA.pem
 
 bin_PROGRAMS = dirmngr dirmngr-client
 
 if USE_LDAP
 libexec_PROGRAMS = dirmngr_ldap
 else
 libexec_PROGRAMS =
 endif
 
 noinst_PROGRAMS = $(module_tests) $(module_net_tests) $(module_maint_tests)
 if DISABLE_TESTS
 TESTS =
 else
 TESTS = $(module_tests) $(module_net_tests)
 endif
 
 AM_CPPFLAGS =
 
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
 dirmngr_rc_objs        = dirmngr-w32info.o
 dirmngr_ldap_rc_objs   = dirmngr_ldap-w32info.o
 dirmngr_client_rc_objs = dirmngr-client-w32info.o
 
 dirmngr-w32info.o        : dirmngr.w32-manifest        ../common/w32info-rc.h
 dirmngr_ldap-w32info.o   : dirmngr_ldap.w32-manifest   ../common/w32info-rc.h
 dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
 endif
 
 AM_CFLAGS = $(USE_C99_CFLAGS) \
             $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS)	\
             $(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS)		\
             $(LIBGNUTLS_CFLAGS)
 
 
 if HAVE_W32_SYSTEM
 ldap_url = ldap-url.h ldap-url.c
+NETLIBS += -lwinhttp
 else
 ldap_url =
 endif
 
 noinst_HEADERS = dirmngr.h crlcache.h crlfetch.h misc.h
 
 dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c	\
 	certcache.c certcache.h \
 	domaininfo.c \
 	workqueue.c \
 	loadswdb.c \
 	cdb.h cdblib.c misc.c dirmngr-err.h dirmngr-status.h \
 	ocsp.c ocsp.h validate.c validate.h  \
 	dns-stuff.c dns-stuff.h \
 	http.c http.h http-common.c http-common.h http-ntbtls.c \
 	ks-action.c ks-action.h ks-engine.h \
 	ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c
 
 if USE_LIBDNS
 dirmngr_SOURCES += dns.c dns.h
 endif
 
 if USE_LDAP
 dirmngr_SOURCES += ldapserver.h ldapserver.c ldap.c w32-ldap-help.h \
                    ldap-wrapper.h ldap-parse-uri.c ldap-parse-uri.h \
                    ldap-misc.c ldap-misc.h \
                    ks-engine-ldap.c $(ldap_url) ldap-wrapper.c
 ldaplibs = $(LDAPLIBS)
 else
 ldaplibs =
 endif
 
 
 dirmngr_LDADD = $(libcommonpth) \
         $(DNSLIBS) $(LIBASSUAN_LIBS) \
 	$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
         $(NETLIBS) $(dirmngr_rc_obj)
 if USE_LDAP
 dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
 endif
 dirmngr_LDFLAGS = $(extra_bin_ldflags)
 dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
 
 if USE_LDAP
 dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
 dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
 dirmngr_ldap_LDFLAGS =
 dirmngr_ldap_LDADD = $(libcommon) \
 		     $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
 		     $(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)  \
                      $(dirmngr_ldap_rc_objs)
 dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
 endif
 
 dirmngr_client_SOURCES = dirmngr-client.c
 dirmngr_client_LDADD = $(libcommon) \
                        $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
                        $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
                        $(dirmngr_client_rc_objs)
 dirmngr_client_LDFLAGS =
 dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
 
 t_common_src = t-support.h t-support.c
 if USE_LIBDNS
 t_common_src += dns.c dns.h
 endif
 t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) \
                  $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
                  $(LIBGNUTLS_LIBS) \
                  $(NETLIBS) $(DNSLIBS) $(LIBINTL) $(LIBICONV)
 
 module_tests = t-http-basic
 
 if USE_LDAP
 module_tests += t-ldap-parse-uri t-ldap-misc
 endif
 
 # Test which need a network connections are only used in maintainer mode.
 if MAINTAINER_MODE
 module_net_tests = t-dns-stuff
 else
 module_net_tests =
 endif
 
 # Tests which are only for manually testing are only build in maintainer-mode.
 if MAINTAINER_MODE
 module_maint_tests = t-http
 else
 module_maint_tests =
 endif
 
 
 # http tests
 # We need to add the KSBA flags in case we are building against GNUTLS.
 # In that case NTBTLS flags are empty, but we need ksba anyway.
 t_http_SOURCES = $(t_common_src) t-http.c http.c dns-stuff.c http-common.c
 t_http_CFLAGS  = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 	         $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \
                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 t_http_LDADD   = $(t_common_ldadd) \
 	         $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS)
 
 t_http_basic_SOURCES = $(t_common_src) t-http-basic.c http.c \
 	               dns-stuff.c http-common.c
 t_http_basic_CFLAGS  = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 	         $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \
                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 t_http_basic_LDADD   = $(t_common_ldadd) \
 	               $(NTBTLS_LIBS) $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
                        $(GPG_ERROR_LIBS) \
                        $(LIBGNUTLS_LIBS) $(DNSLIBS)
 
 t_ldap_parse_uri_SOURCES = \
 	t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \
         http.c http-common.c dns-stuff.c ldap-misc.c \
         $(ldap_url) $(t_common_src)
 t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 			  $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
                           $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS)
 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(KSBA_LIBS) $(DNSLIBS)
 
 t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url)
 t_ldap_misc_CFLAGS = -DWITHOUT_NPTH=1 $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) \
                      $(NTBTLS_CFLAGS)
 t_ldap_misc_LDFLAGS =
 t_ldap_misc_LDADD = $(libcommon) $(NTBTLS_LIBS) $(LIBGCRYPT_LIBS) \
                     $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \
                     $(KSBA_LIBS) $(GPG_ERROR_LIBS) $(LIBICONV) $(NETLIBS)
 
 
 t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1  $(USE_C99_CFLAGS) \
 		     $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) \
 	             $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
 t_dns_stuff_SOURCES = $(t_common_src) t-dns-stuff.c dns-stuff.c
 t_dns_stuff_LDADD   = $(t_common_ldadd) $(DNSLIBS)
 
 $(PROGRAMS) : $(libcommon) $(libcommonpth)
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index fa03614bd..06ef22bf5 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1,2536 +1,2537 @@
 /* dirmngr.c - Keyserver and X.509 LDAP access
  * Copyright (C) 2002 Klarälvdalens Datakonsult AB
  * Copyright (C) 2003-2004, 2006-2007, 2008, 2010-2011, 2020-2021 g10 Code GmbH
  * Copyright (C) 2014 Werner Koch
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 #include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
 #include <time.h>
 #include <fcntl.h>
 #ifndef HAVE_W32_SYSTEM
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
 #include <sys/stat.h>
 #include <unistd.h>
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
 #ifdef HAVE_INOTIFY_INIT
 # include <sys/inotify.h>
 #endif /*HAVE_INOTIFY_INIT*/
 #include <npth.h>
 
 #include "dirmngr-err.h"
 
 #if  HTTP_USE_NTBTLS
 # include <ntbtls.h>
 #elif HTTP_USE_GNUTLS
 # include <gnutls/gnutls.h>
 #endif /*HTTP_USE_GNUTLS*/
 
 
 #define INCLUDED_BY_MAIN_MODULE 1
 #define GNUPG_COMMON_NEED_AFLOCAL
 #include "dirmngr.h"
 
 #include <assuan.h>
 
 #include "certcache.h"
 #include "crlcache.h"
 #include "crlfetch.h"
 #include "misc.h"
 #if USE_LDAP
 # include "ldapserver.h"
 #endif
 #include "../common/asshelp.h"
 #if USE_LDAP
 # include "ldap-wrapper.h"
 #endif
 #include "../common/init.h"
 #include "../common/gc-opt-flags.h"
 #include "dns-stuff.h"
 #include "http-common.h"
 
 #ifndef ENAMETOOLONG
 # define ENAMETOOLONG EINVAL
 #endif
 
 
 enum cmd_and_opt_values {
   aNull = 0,
   oCsh		  = 'c',
   oQuiet	  = 'q',
   oSh		  = 's',
   oVerbose	  = 'v',
   oNoVerbose = 500,
 
   aServer,
   aDaemon,
   aSupervised,
   aListCRLs,
   aLoadCRL,
   aFetchCRL,
   aShutdown,
   aFlush,
   aGPGConfList,
   aGPGConfTest,
   aGPGConfVersions,
 
   oOptions,
   oDebug,
   oDebugAll,
   oDebugWait,
   oDebugLevel,
   oGnutlsDebug,
   oDebugCacheExpiredCerts,
   oNoGreeting,
   oNoOptions,
   oHomedir,
   oNoDetach,
   oLogFile,
   oBatch,
   oDisableHTTP,
   oDisableLDAP,
   oDisableIPv4,
   oDisableIPv6,
   oIgnoreLDAPDP,
   oIgnoreHTTPDP,
   oIgnoreOCSPSvcUrl,
   oHonorHTTPProxy,
   oHTTPProxy,
   oLDAPProxy,
   oOnlyLDAPProxy,
   oLDAPServer,
   oLDAPFile,
   oLDAPTimeout,
   oLDAPAddServers,
   oOCSPResponder,
   oOCSPSigner,
   oOCSPMaxClockSkew,
   oOCSPMaxPeriod,
   oOCSPCurrentPeriod,
   oMaxReplies,
   oHkpCaCert,
   oFakedSystemTime,
   oForce,
   oAllowOCSP,
   oAllowVersionCheck,
   oStealSocket,
   oSocketName,
   oLDAPWrapperProgram,
   oHTTPWrapperProgram,
   oIgnoreCert,
   oIgnoreCertExtension,
   oIgnoreCRLExtension,
   oUseTor,
   oNoUseTor,
   oKeyServer,
   oNameServer,
   oDisableCheckOwnSocket,
   oStandardResolver,
   oRecursiveResolver,
   oResolverTimeout,
   oConnectTimeout,
   oConnectQuickTimeout,
   oListenBacklog,
   oCompatibilityFlags,
   aTest
 };
 
 
 
 static ARGPARSE_OPTS opts[] = {
 
   ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
   ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
   ARGPARSE_c (aGPGConfVersions, "gpgconf-versions", "@"),
 
   ARGPARSE_group (300, N_("@Commands:\n ")),
 
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
   ARGPARSE_c (aDaemon,   "daemon",  N_("run in daemon mode (background)") ),
 #ifndef HAVE_W32_SYSTEM
   ARGPARSE_c (aSupervised,  "supervised", N_("run in supervised mode")),
 #endif
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
   ARGPARSE_c (aLoadCRL,  "load-crl", N_("|FILE|load CRL from FILE into cache")),
   ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
   ARGPARSE_c (aShutdown, "shutdown",  N_("shutdown the dirmngr")),
   ARGPARSE_c (aFlush,    "flush",     N_("flush the cache")),
 
 
   ARGPARSE_header (NULL, N_("Options used for startup")),
 
   ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,       "sh",        N_("sh-style command output")),
   ARGPARSE_s_n (oCsh,      "csh",       N_("csh-style command output")),
   ARGPARSE_s_n (oStealSocket, "steal-socket", "@"),
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_conffile (oOptions,  "options", N_("|FILE|read options from FILE")),
   ARGPARSE_noconffile (oNoOptions, "no-options", "@"),
 
 
   ARGPARSE_header ("Monitor", N_("Options controlling the diagnostic output")),
 
   ARGPARSE_s_n (oVerbose,  "verbose",   N_("verbose")),
   ARGPARSE_s_n (oQuiet,    "quiet",     N_("be somewhat more quiet")),
   ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
   ARGPARSE_s_s (oDebugLevel, "debug-level",
                 N_("|LEVEL|set the debugging level to LEVEL")),
   ARGPARSE_s_s (oDebug,    "debug", "@"),
   ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
   ARGPARSE_s_i (oGnutlsDebug, "gnutls-debug", "@"),
   ARGPARSE_s_i (oGnutlsDebug, "tls-debug", "@"),
   ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
   ARGPARSE_s_s (oLogFile,  "log-file",
                 N_("|FILE|write server mode logs to FILE")),
 
 
   ARGPARSE_header ("Configuration",
                    N_("Options controlling the configuration")),
 
   ARGPARSE_s_n (oAllowVersionCheck, "allow-version-check",
                 N_("allow online software version check")),
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
   ARGPARSE_s_i (oMaxReplies, "max-replies",
                 N_("|N|do not return more than N items in one query")),
   ARGPARSE_s_u (oFakedSystemTime, "faked-system-time", "@"), /*(epoch time)*/
   ARGPARSE_s_n (oDisableCheckOwnSocket, "disable-check-own-socket", "@"),
   ARGPARSE_s_s (oIgnoreCert,"ignore-cert", "@"),
   ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
   ARGPARSE_s_s (oIgnoreCRLExtension,"ignore-crl-extension", "@"),
 
 
   ARGPARSE_header ("Network", N_("Network related options")),
 
   ARGPARSE_s_n (oUseTor, "use-tor", N_("route all network traffic via Tor")),
   ARGPARSE_s_n (oNoUseTor, "no-use-tor", "@"),
   ARGPARSE_s_n (oDisableIPv4, "disable-ipv4", "@"),
   ARGPARSE_s_n (oDisableIPv6, "disable-ipv6", "@"),
   ARGPARSE_s_n (oStandardResolver, "standard-resolver", "@"),
   ARGPARSE_s_n (oRecursiveResolver, "recursive-resolver", "@"),
   ARGPARSE_s_i (oResolverTimeout, "resolver-timeout", "@"),
   ARGPARSE_s_s (oNameServer, "nameserver", "@"),
   ARGPARSE_s_i (oConnectTimeout, "connect-timeout", "@"),
   ARGPARSE_s_i (oConnectQuickTimeout, "connect-quick-timeout", "@"),
 
 
   ARGPARSE_header ("Keyserver", N_("Configuration for Keyservers")),
 
   ARGPARSE_s_s (oKeyServer, "keyserver",
                 N_("|URL|use keyserver at URL")),
   ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
                 N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
 
 
   ARGPARSE_header ("HTTP", N_("Configuration for HTTP servers")),
 
   ARGPARSE_s_n (oDisableHTTP, "disable-http", N_("inhibit the use of HTTP")),
   ARGPARSE_s_n (oIgnoreHTTPDP,"ignore-http-dp",
                 N_("ignore HTTP CRL distribution points")),
   ARGPARSE_s_s (oHTTPProxy,  "http-proxy",
                 N_("|URL|redirect all HTTP requests to URL")),
   ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy",
                 N_("use system's HTTP proxy setting")),
   ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
 
 
   ARGPARSE_header ("LDAP", N_("Configuration of LDAP servers to use")),
 
   ARGPARSE_s_n (oDisableLDAP, "disable-ldap", N_("inhibit the use of LDAP")),
   ARGPARSE_s_n (oIgnoreLDAPDP,"ignore-ldap-dp",
                 N_("ignore LDAP CRL distribution points")),
   ARGPARSE_s_s (oLDAPProxy,  "ldap-proxy",
                 N_("|HOST|use HOST for LDAP queries")),
   ARGPARSE_s_n (oOnlyLDAPProxy, "only-ldap-proxy",
                 N_("do not use fallback hosts with --ldap-proxy")),
   ARGPARSE_s_s (oLDAPServer, "ldapserver",
                 N_("|SPEC|use this keyserver to lookup keys")),
   ARGPARSE_s_s (oLDAPFile, "ldapserverlist-file",
                 N_("|FILE|read LDAP server list from FILE")),
   ARGPARSE_s_n (oLDAPAddServers, "add-servers",
                 N_("add new servers discovered in CRL distribution"
                    " points to serverlist")),
   ARGPARSE_s_i (oLDAPTimeout, "ldaptimeout",
                 N_("|N|set LDAP timeout to N seconds")),
 
 
   ARGPARSE_header ("OCSP", N_("Configuration for OCSP")),
 
   ARGPARSE_s_n (oAllowOCSP, "allow-ocsp", N_("allow sending OCSP requests")),
   ARGPARSE_s_n (oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url",
                 N_("ignore certificate contained OCSP service URLs")),
   ARGPARSE_s_s (oOCSPResponder, "ocsp-responder",
                 N_("|URL|use OCSP responder at URL")),
   ARGPARSE_s_s (oOCSPSigner, "ocsp-signer",
                 N_("|FPR|OCSP response signed by FPR")),
   ARGPARSE_s_i (oOCSPMaxClockSkew, "ocsp-max-clock-skew", "@"),
   ARGPARSE_s_i (oOCSPMaxPeriod,    "ocsp-max-period", "@"),
   ARGPARSE_s_i (oOCSPCurrentPeriod, "ocsp-current-period", "@"),
 
 
   ARGPARSE_header (NULL, N_("Other options")),
 
   ARGPARSE_s_n (oForce,    "force",    N_("force loading of outdated CRLs")),
 
   ARGPARSE_s_s (oSocketName, "socket-name", "@"),  /* Only for debugging.  */
   ARGPARSE_s_n (oDebugCacheExpiredCerts, "debug-cache-expired-certs", "@"),
   ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
 
   ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
   /* Not yet used options.  */
   ARGPARSE_s_n (oBatch,    "batch",       "@"),
   ARGPARSE_s_s (oHTTPWrapperProgram, "http-wrapper-program", "@"),
 
 
   ARGPARSE_group (302,N_("@\n(See the \"info\" manual for a complete listing "
                          "of all commands and options)\n")),
 
   ARGPARSE_end ()
 };
 
 /* The list of supported debug flags.  */
 static struct debug_flags_s debug_flags [] =
   {
     { DBG_X509_VALUE   , "x509"    },
     { DBG_CRYPTO_VALUE , "crypto"  },
     { DBG_MEMORY_VALUE , "memory"  },
     { DBG_CACHE_VALUE  , "cache"   },
     { DBG_MEMSTAT_VALUE, "memstat" },
     { DBG_HASHING_VALUE, "hashing" },
     { DBG_IPC_VALUE    , "ipc"     },
     { DBG_DNS_VALUE    , "dns"     },
     { DBG_NETWORK_VALUE, "network" },
     { DBG_LOOKUP_VALUE , "lookup"  },
     { DBG_EXTPROG_VALUE, "extprog" },
     { 77, NULL } /* 77 := Do not exit on "help" or "?".  */
   };
 
 /* The list of compatibility flags.  */
 static struct compatibility_flags_s compatibility_flags [] =
   {
     { 0, NULL }
   };
 
 
 #define DEFAULT_MAX_REPLIES 10
 #define DEFAULT_LDAP_TIMEOUT 15  /* seconds */
 
 #define DEFAULT_CONNECT_TIMEOUT       (15*1000)  /* 15 seconds */
 #define DEFAULT_CONNECT_QUICK_TIMEOUT ( 2*1000)  /*  2 seconds */
 
 /* For the cleanup handler we need to keep track of the socket's name.  */
 static const char *socket_name;
 /* If the socket has been redirected, this is the name of the
    redirected socket..  */
 static const char *redir_socket_name;
 
 /* We need to keep track of the server's nonces (these are dummies for
    POSIX systems). */
 static assuan_sock_nonce_t socket_nonce;
 
 /* Value for the listen() backlog argument.
  * Change at runtime with --listen-backlog.  */
 static int listen_backlog = 64;
 
 /* Only if this flag has been set will we remove the socket file.  */
 static int cleanup_socket;
 
 /* Keep track of the current log file so that we can avoid updating
    the log file after a SIGHUP if it didn't changed. Malloced. */
 static char *current_logfile;
 
 /* Helper to implement --debug-level. */
 static const char *debug_level;
 
 /* Helper to set the NTBTLS or GNUTLS log level.  */
 static int opt_gnutls_debug = -1;
 
 /* Flag indicating that a shutdown has been requested.  */
 static volatile int shutdown_pending;
 
 /* Flags to indicate that we shall not watch our own socket. */
 static int disable_check_own_socket;
 
 /* Flag indicating to start the daemon even if one already runs.  */
 static int steal_socket;
 
 
 /* Flag to control the Tor mode.  */
 static enum
   { TOR_MODE_AUTO = 0,  /* Switch to NO or YES         */
     TOR_MODE_NEVER,     /* Never use Tor.              */
     TOR_MODE_NO,        /* Do not use Tor              */
     TOR_MODE_YES,       /* Use Tor                     */
     TOR_MODE_FORCE      /* Force using Tor             */
   } tor_mode;
 
 
 /* Counter for the active connections.  */
 static int active_connections;
 
 /* This flag is set by any network access and used by the housekeeping
  * thread to run background network tasks.  */
 static int network_activity_seen;
 
 /* A list of filenames registred with --hkp-cacert.  */
 static strlist_t hkp_cacert_filenames;
 
 /* A flag used to clear the list of ldapservers iff --ldapserver is
  * given on the command line or one of the conf files. In this case we
  * want to clear all old specifications through the legacy
  * dirmngr_ldapservers.conf. */
 static int ldapserver_list_needs_reset;
 
 /* The timer tick used for housekeeping stuff.  The second constant is used when a shutdown is pending.  */
 #define TIMERTICK_INTERVAL           (60)
 #define TIMERTICK_INTERVAL_SHUTDOWN  (4)
 
 /* How oft to run the housekeeping.  */
 #define HOUSEKEEPING_INTERVAL      (600)
 
 
 /* This union is used to avoid compiler warnings in case a pointer is
    64 bit and an int 32 bit.  We store an integer in a pointer and get
    it back later (npth_getspecific et al.).  */
 union int_and_ptr_u
 {
   int  aint;
   assuan_fd_t afd;
   void *aptr;
 };
 
 
 
 /* The key used to store the current file descriptor in the thread
    local storage.  We use this in conjunction with the
    log_set_pid_suffix_cb feature.  */
 #ifndef HAVE_W32_SYSTEM
 static npth_key_t my_tlskey_current_fd;
 #endif
 
 /* Prototypes. */
 static void cleanup (void);
 #if USE_LDAP
 static ldap_server_t parse_ldapserver_file (const char* filename, int ienoent);
 #endif /*USE_LDAP*/
 static fingerprint_list_t parse_fingerprint_item (const char *string,
                                                   const  char *optionname,
                                                   int want_binary);
 static void netactivity_action (void);
 static void handle_connections (assuan_fd_t listen_fd);
 static void gpgconf_versions (void);
 
 
 /* NPth wrapper function definitions. */
 ASSUAN_SYSTEM_NPTH_IMPL;
 
 static const char *
 my_strusage( int level )
 {
   const char *p;
   switch ( level )
     {
     case  9: p = "GPL-3.0-or-later"; break;
     case 11: p = "@DIRMNGR@ (@GNUPG@)";
       break;
     case 13: p = VERSION; break;
     case 14: p = GNUPG_DEF_COPYRIGHT_LINE; break;
     case 17: p = PRINTABLE_OS_NAME; break;
       /* TRANSLATORS: @EMAIL@ will get replaced by the actual bug
          reporting address.  This is so that we can change the
          reporting address without breaking the translations.  */
     case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
     case 49: p = PACKAGE_BUGREPORT; break;
     case 1:
     case 40: p = _("Usage: @DIRMNGR@ [options] (-h for help)");
       break;
     case 41: p = _("Syntax: @DIRMNGR@ [options] [command [args]]\n"
                    "Keyserver, CRL, and OCSP access for @GNUPG@\n");
       break;
 
     default: p = NULL;
     }
   return p;
 }
 
 
 /* Callback from libksba to hash a provided buffer.  Our current
    implementation does only allow SHA-1 for hashing. This may be
    extended by mapping the name, testing for algorithm availibility
    and adjust the length checks accordingly. */
 static gpg_error_t
 my_ksba_hash_buffer (void *arg, const char *oid,
                      const void *buffer, size_t length, size_t resultsize,
                      unsigned char *result, size_t *resultlen)
 {
   (void)arg;
 
   if (oid && strcmp (oid, "1.3.14.3.2.26"))
     return gpg_error (GPG_ERR_NOT_SUPPORTED);
   if (resultsize < 20)
     return gpg_error (GPG_ERR_BUFFER_TOO_SHORT);
   gcry_md_hash_buffer (2, result, buffer, length);
   *resultlen = 20;
   return 0;
 }
 
 
 /* GNUTLS log function callback.  */
 #ifdef HTTP_USE_GNUTLS
 static void
 my_gnutls_log (int level, const char *text)
 {
   int n;
 
   n = strlen (text);
   while (n && text[n-1] == '\n')
     n--;
 
   log_debug ("gnutls:L%d: %.*s\n", level, n, text);
 }
 #endif /*HTTP_USE_GNUTLS*/
 
 /* Setup the debugging.  With a LEVEL of NULL only the active debug
    flags are propagated to the subsystems.  With LEVEL set, a specific
    set of debug flags is set; thus overriding all flags already
    set. */
 static void
 set_debug (void)
 {
   int numok = (debug_level && digitp (debug_level));
   int numlvl = numok? atoi (debug_level) : 0;
 
   if (!debug_level)
     ;
   else if (!strcmp (debug_level, "none") || (numok && numlvl < 1))
     opt.debug = 0;
   else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
     opt.debug = DBG_IPC_VALUE;
   else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5))
     opt.debug = (DBG_IPC_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE);
   else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8))
     opt.debug = (DBG_IPC_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE
                  |DBG_CACHE_VALUE|DBG_CRYPTO_VALUE);
   else if (!strcmp (debug_level, "guru") || numok)
     {
       opt.debug = ~0;
       /* Unless the "guru" string has been used we don't want to allow
          hashing debugging.  The rationale is that people tend to
          select the highest debug value and would then clutter their
          disk with debug files which may reveal confidential data.  */
       if (numok)
         opt.debug &= ~(DBG_HASHING_VALUE);
     }
   else
     {
       log_error (_("invalid debug-level '%s' given\n"), debug_level);
       log_info (_("valid debug levels are: %s\n"),
                 "none, basic, advanced, expert, guru");
       opt.debug = 0; /* Reset debugging, so that prior debug
                         statements won't have an undesired effect. */
     }
 
 
   if (opt.debug && !opt.verbose)
     {
       opt.verbose = 1;
       gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
     }
   if (opt.debug && opt.quiet)
     opt.quiet = 0;
 
   if (opt.debug & DBG_CRYPTO_VALUE )
     gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
 
 #if HTTP_USE_NTBTLS
   if (opt_gnutls_debug >= 0)
     {
       ntbtls_set_debug (opt_gnutls_debug, NULL, NULL);
     }
 #elif HTTP_USE_GNUTLS
   if (opt_gnutls_debug >= 0)
     {
       gnutls_global_set_log_function (my_gnutls_log);
       gnutls_global_set_log_level (opt_gnutls_debug);
     }
 #endif /*HTTP_USE_GNUTLS*/
 
   if (opt.debug)
     parse_debug_flag (NULL, &opt.debug, debug_flags);
 }
 
 
 static void
 set_tor_mode (void)
 {
   if (dirmngr_use_tor ())
     {
       /* Enable Tor mode and when called again force a new curcuit
        * (e.g. on SIGHUP).  */
       enable_dns_tormode (1);
       if (assuan_sock_set_flag (ASSUAN_INVALID_FD, "tor-mode", 1))
         {
           log_error ("error enabling Tor mode: %s\n", strerror (errno));
           log_info ("(is your Libassuan recent enough?)\n");
         }
     }
   else
     disable_dns_tormode ();
 }
 
 
 /* Return true if Tor shall be used.  */
 int
 dirmngr_use_tor (void)
 {
   if (tor_mode == TOR_MODE_AUTO)
     {
       /* Figure out whether Tor is running.  */
       assuan_fd_t sock;
 
       sock = assuan_sock_connect_byname (NULL, 0, 0, NULL, ASSUAN_SOCK_TOR);
       if (sock == ASSUAN_INVALID_FD)
         tor_mode = TOR_MODE_NO;
       else
         {
           tor_mode = TOR_MODE_YES;
           assuan_sock_close (sock);
         }
     }
 
   if (tor_mode == TOR_MODE_FORCE)
     return 2; /* Use Tor (using 2 to indicate force mode) */
   else if (tor_mode == TOR_MODE_YES)
     return 1; /* Use Tor */
   else
     return 0; /* Do not use Tor.  */
 }
 
 
 /* This is somewhat similar to dirmngr_use_tor but avoids a trial
  * connect and may thus be faster for this special case.  */
 int
 dirmngr_never_use_tor_p (void)
 {
   return tor_mode == TOR_MODE_NEVER;
 }
 
 
 static void
 wrong_args (const char *text)
 {
   es_fprintf (es_stderr, _("usage: %s [options] "), DIRMNGR_NAME);
   es_fputs (text, es_stderr);
   es_putc ('\n', es_stderr);
   dirmngr_exit (2);
 }
 
 
 /* Helper to stop the reaper thread for the ldap wrapper.  */
 static void
 shutdown_reaper (void)
 {
 #if USE_LDAP
   ldap_wrapper_wait_connections ();
 #endif
 }
 
 
 /* Handle options which are allowed to be reset after program start.
    Return true if the current option in PARGS could be handled and
    false if not.  As a special feature, passing a value of NULL for
    PARGS, resets the options to the default.  REREAD should be set
    true if it is not the initial option parsing. */
 static int
 parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
 {
   if (!pargs)
     { /* Reset mode. */
       opt.quiet = 0;
       opt.verbose = 0;
       opt.debug = 0;
       opt.ldap_wrapper_program = NULL;
       opt.disable_http = 0;
       opt.disable_ldap = 0;
       opt.honor_http_proxy = 0;
       opt.http_proxy = NULL;
       opt.ldap_proxy = NULL;
       opt.only_ldap_proxy = 0;
       opt.ignore_http_dp = 0;
       opt.ignore_ldap_dp = 0;
       opt.ignore_ocsp_service_url = 0;
       opt.allow_ocsp = 0;
       opt.allow_version_check = 0;
       opt.ocsp_responder = NULL;
       opt.ocsp_max_clock_skew = 10 * 60;      /* 10 minutes.  */
       opt.ocsp_max_period = 90 * 86400;       /* 90 days.  */
       opt.ocsp_current_period = 3 * 60 * 60;  /* 3 hours. */
       opt.max_replies = DEFAULT_MAX_REPLIES;
       while (opt.ocsp_signer)
         {
           fingerprint_list_t tmp = opt.ocsp_signer->next;
           xfree (opt.ocsp_signer);
           opt.ocsp_signer = tmp;
         }
       while (opt.ignored_certs)
         {
           fingerprint_list_t tmp = opt.ignored_certs->next;
           xfree (opt.ignored_certs);
           opt.ignored_certs = tmp;
         }
       FREE_STRLIST (opt.ignored_cert_extensions);
       FREE_STRLIST (opt.ignored_crl_extensions);
       http_register_tls_ca (NULL);
       FREE_STRLIST (hkp_cacert_filenames);
       FREE_STRLIST (opt.keyserver);
       /* Note: We do not allow resetting of TOR_MODE_FORCE at runtime.  */
       if (tor_mode != TOR_MODE_FORCE)
         tor_mode = TOR_MODE_AUTO;
       disable_check_own_socket = 0;
       enable_standard_resolver (0);
       set_dns_timeout (0);
       opt.connect_timeout = 0;
       opt.connect_quick_timeout = 0;
       opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
       ldapserver_list_needs_reset = 1;
       opt.debug_cache_expired_certs = 0;
       opt.compat_flags = 0;
       return 1;
     }
 
   switch (pargs->r_opt)
     {
     case oQuiet:   opt.quiet = 1; break;
     case oVerbose: opt.verbose++; break;
     case oDebug:
       parse_debug_flag (pargs->r.ret_str, &opt.debug, debug_flags);
       break;
     case oDebugAll: opt.debug = ~0; break;
     case oDebugLevel: debug_level = pargs->r.ret_str; break;
     case oGnutlsDebug: opt_gnutls_debug = pargs->r.ret_int; break;
 
     case oLogFile:
       if (!reread)
         return 0; /* Not handled. */
       if (!current_logfile || !pargs->r.ret_str
           || strcmp (current_logfile, pargs->r.ret_str))
         {
           log_set_file (pargs->r.ret_str);
           xfree (current_logfile);
           current_logfile = xtrystrdup (pargs->r.ret_str);
         }
       break;
 
     case oDisableCheckOwnSocket: disable_check_own_socket = 1; break;
 
     case oLDAPWrapperProgram:
       opt.ldap_wrapper_program = pargs->r.ret_str;
       break;
     case oHTTPWrapperProgram:
       opt.http_wrapper_program = pargs->r.ret_str;
       break;
 
     case oDisableHTTP: opt.disable_http = 1; break;
     case oDisableLDAP: opt.disable_ldap = 1; break;
     case oDisableIPv4: opt.disable_ipv4 = 1; break;
     case oDisableIPv6: opt.disable_ipv6 = 1; break;
     case oHonorHTTPProxy: opt.honor_http_proxy = 1; break;
     case oHTTPProxy: opt.http_proxy = pargs->r.ret_str; break;
     case oLDAPProxy: opt.ldap_proxy = pargs->r.ret_str; break;
     case oOnlyLDAPProxy: opt.only_ldap_proxy = 1; break;
     case oIgnoreHTTPDP: opt.ignore_http_dp = 1; break;
     case oIgnoreLDAPDP: opt.ignore_ldap_dp = 1; break;
     case oIgnoreOCSPSvcUrl: opt.ignore_ocsp_service_url = 1; break;
 
     case oAllowOCSP: opt.allow_ocsp = 1; break;
     case oAllowVersionCheck: opt.allow_version_check = 1; break;
     case oOCSPResponder: opt.ocsp_responder = pargs->r.ret_str; break;
     case oOCSPSigner:
       opt.ocsp_signer = parse_fingerprint_item (pargs->r.ret_str,
                                                 "--ocsp-signer", 0);
       break;
     case oOCSPMaxClockSkew: opt.ocsp_max_clock_skew = pargs->r.ret_int; break;
     case oOCSPMaxPeriod: opt.ocsp_max_period = pargs->r.ret_int; break;
     case oOCSPCurrentPeriod: opt.ocsp_current_period = pargs->r.ret_int; break;
 
     case oMaxReplies: opt.max_replies = pargs->r.ret_int; break;
 
     case oHkpCaCert:
       {
         /* We need to register the filenames with gnutls (http.c) and
          * also for our own cert cache.  */
         char *tmpname;
 
         /* Do tilde expansion and make path absolute.  */
         tmpname = make_absfilename (pargs->r.ret_str, NULL);
         http_register_tls_ca (tmpname);
         add_to_strlist (&hkp_cacert_filenames, pargs->r.ret_str);
         xfree (tmpname);
       }
       break;
 
     case oIgnoreCert:
       {
         fingerprint_list_t item, r;
         item = parse_fingerprint_item (pargs->r.ret_str, "--ignore-cert", 20);
         if (item)
           {  /* Append  */
             if (!opt.ignored_certs)
               opt.ignored_certs = item;
             else
               {
                 for (r = opt.ignored_certs; r->next; r = r->next)
                   ;
                 r->next = item;
               }
           }
       }
       break;
 
     case oIgnoreCertExtension:
       add_to_strlist (&opt.ignored_cert_extensions, pargs->r.ret_str);
       break;
 
     case oIgnoreCRLExtension:
       add_to_strlist (&opt.ignored_crl_extensions, pargs->r.ret_str);
       break;
 
     case oUseTor:
       tor_mode = TOR_MODE_FORCE;
       break;
     case oNoUseTor:
       if (tor_mode != TOR_MODE_FORCE)
         tor_mode = TOR_MODE_NEVER;
       break;
 
     case oStandardResolver: enable_standard_resolver (1); break;
     case oRecursiveResolver: enable_recursive_resolver (1); break;
 
     case oLDAPServer:
 #if USE_LDAP
       {
         ldap_server_t server;
         char *p;
 
         p = pargs->r.ret_str;
         if (!strncmp (p, "ldap:", 5) && !(p[5] == '/' && p[6] == '/'))
           p += 5;
 
         server = ldapserver_parse_one (p, NULL, 0);
         if (server)
           {
             if (ldapserver_list_needs_reset)
               {
                 ldapserver_list_needs_reset = 0;
                 ldapserver_list_free (opt.ldapservers);
                 opt.ldapservers = NULL;
               }
             server->next = opt.ldapservers;
             opt.ldapservers = server;
           }
       }
 #endif
       break;
 
     case oKeyServer:
       if (*pargs->r.ret_str)
         add_to_strlist (&opt.keyserver, pargs->r.ret_str);
       break;
 
     case oNameServer:
       set_dns_nameserver (pargs->r.ret_str);
       break;
 
     case oResolverTimeout:
       set_dns_timeout (pargs->r.ret_int);
       break;
 
     case oConnectTimeout:
       opt.connect_timeout = pargs->r.ret_ulong * 1000;
       break;
 
     case oConnectQuickTimeout:
       opt.connect_quick_timeout = pargs->r.ret_ulong * 1000;
       break;
 
     case oLDAPTimeout:
       opt.ldaptimeout = pargs->r.ret_int;
       break;
 
     case oDebugCacheExpiredCerts:
       opt.debug_cache_expired_certs = 0;
       break;
 
     case oCompatibilityFlags:
       if (parse_compatibility_flags (pargs->r.ret_str, &opt.compat_flags,
                                      compatibility_flags))
         {
           pargs->r_opt = ARGPARSE_INVALID_ARG;
           pargs->err = ARGPARSE_PRINT_WARNING;
         }
       break;
 
     default:
       return 0; /* Not handled. */
     }
 
   set_dns_verbose (opt.verbose, !!DBG_DNS);
   http_set_verbose (opt.verbose, !!DBG_NETWORK);
   set_dns_disable_ipv4 (opt.disable_ipv4);
   set_dns_disable_ipv6 (opt.disable_ipv6);
 
   return 1; /* Handled. */
 }
 
 
 /* This fucntion is called after option parsing to adjust some values
  * and call option setup functions.  */
 static void
 post_option_parsing (enum cmd_and_opt_values cmd)
 {
   /* It would be too surpirsing if the quick timeout is larger than
    * the standard value.  */
   if (opt.connect_quick_timeout > opt.connect_timeout)
     opt.connect_quick_timeout = opt.connect_timeout;
 
   set_debug ();
   /* For certain commands we do not want to set/test for Tor mode
    * because that is somewhat expensive.  */
   switch (cmd)
     {
     case aGPGConfList:
     case aGPGConfTest:
     case aGPGConfVersions:
       break;
     default:
       set_tor_mode ();
       break;
     }
 }
 
 
 #ifndef HAVE_W32_SYSTEM
 static int
 pid_suffix_callback (unsigned long *r_suffix)
 {
   union int_and_ptr_u value;
 
   memset (&value, 0, sizeof value);
   value.aptr = npth_getspecific (my_tlskey_current_fd);
   *r_suffix = value.aint;
   return (*r_suffix != -1);  /* Use decimal representation.  */
 }
 #endif /*!HAVE_W32_SYSTEM*/
 
 #if HTTP_USE_NTBTLS
 static void
 my_ntbtls_log_handler (void *opaque, int level, const char *fmt, va_list argv)
 {
   (void)opaque;
 
   if (level == -1)
     log_logv_with_prefix (GPGRT_LOG_INFO, "ntbtls: ", fmt, argv);
   else
     {
       char prefix[10+20];
       snprintf (prefix, sizeof prefix, "ntbtls(%d): ", level);
       log_logv_with_prefix (GPGRT_LOG_DEBUG, prefix, fmt, argv);
     }
 }
 #endif
 
 
 static void
 thread_init (void)
 {
   npth_init ();
   assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 
   /* Now with NPth running we can set the logging callback.  Our
      windows implementation does not yet feature the NPth TLS
      functions.  */
 #ifndef HAVE_W32_SYSTEM
   if (npth_key_create (&my_tlskey_current_fd, NULL) == 0)
     if (npth_setspecific (my_tlskey_current_fd, NULL) == 0)
       log_set_pid_suffix_cb (pid_suffix_callback);
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
 
 int
 main (int argc, char **argv)
 {
   enum cmd_and_opt_values cmd = 0;
   ARGPARSE_ARGS pargs;
   int orig_argc;
   char **orig_argv;
   char *last_configname = NULL;
   const char *configname = NULL;
   const char *shell;
   int debug_argparser = 0;
   int greeting = 0;
   int nogreeting = 0;
   int nodetach = 0;
   int csh_style = 0;
   char *logfile = NULL;
 #if USE_LDAP
   char *ldapfile = NULL;
 #endif /*USE_LDAP*/
   int debug_wait = 0;
   int rc;
   struct assuan_malloc_hooks malloc_hooks;
 
   early_system_init ();
   set_strusage (my_strusage);
   log_set_prefix (DIRMNGR_NAME, GPGRT_LOG_WITH_PREFIX | GPGRT_LOG_WITH_PID);
 
   /* Make sure that our subsystems are ready.  */
   i18n_init ();
   init_common_subsystems (&argc, &argv);
 
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
 
  /* Check that the libraries are suitable.  Do it here because
     the option parsing may need services of the libraries. */
   if (!ksba_check_version (NEED_KSBA_VERSION) )
     log_fatal( _("%s is too old (need %s, have %s)\n"), "libksba",
                NEED_KSBA_VERSION, ksba_check_version (NULL) );
 
   ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free );
   ksba_set_hash_buffer_function (my_ksba_hash_buffer, NULL);
 
   /* Init TLS library.  */
 #if HTTP_USE_NTBTLS
   if (!ntbtls_check_version (NEED_NTBTLS_VERSION) )
     log_fatal( _("%s is too old (need %s, have %s)\n"), "ntbtls",
                NEED_NTBTLS_VERSION, ntbtls_check_version (NULL) );
 #elif HTTP_USE_GNUTLS
   rc = gnutls_global_init ();
   if (rc)
     log_fatal ("gnutls_global_init failed: %s\n", gnutls_strerror (rc));
 #endif /*HTTP_USE_GNUTLS*/
 
   /* Init Assuan. */
   malloc_hooks.malloc = gcry_malloc;
   malloc_hooks.realloc = gcry_realloc;
   malloc_hooks.free = gcry_free;
   assuan_set_malloc_hooks (&malloc_hooks);
   assuan_set_assuan_log_prefix (log_get_prefix (NULL));
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
   assuan_sock_init ();
   setup_libassuan_logging (&opt.debug, dirmngr_assuan_log_monitor);
 
   setup_libgcrypt_logging ();
 
 #if HTTP_USE_NTBTLS
   ntbtls_set_log_handler (my_ntbtls_log_handler, NULL);
 #endif
 
   /* Setup defaults. */
   shell = getenv ("SHELL");
   if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
     csh_style = 1;
 
   /* Reset rereadable options to default values. */
   parse_rereadable_options (NULL, 0);
 
   /* Default TCP timeouts.  */
   opt.connect_timeout = DEFAULT_CONNECT_TIMEOUT;
   opt.connect_quick_timeout = DEFAULT_CONNECT_QUICK_TIMEOUT;
 
   /* LDAP defaults.  */
   opt.add_new_ldapservers = 0;
   opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
 
   /* Other defaults.  */
 
   /* Check whether we have a config file given on the commandline */
   orig_argc = argc;
   orig_argv = argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags= (ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
   while (gnupg_argparse (NULL, &pargs, opts))
     {
       switch (pargs.r_opt)
         {
         case oDebug:
         case oDebugAll:
           debug_argparser++;
           break;
         case oHomedir:
           gnupg_set_homedir (pargs.r.ret_str);
           break;
         }
     }
   /* Reset the flags.  */
   pargs.flags &= ~(ARGPARSE_FLAG_KEEP | ARGPARSE_FLAG_NOVERSION);
 
   socket_name = dirmngr_socket_name ();
 
   /* The configuraton directories for use by gpgrt_argparser.  */
   gnupg_set_confdir (GNUPG_CONFDIR_SYS, gnupg_sysconfdir ());
   gnupg_set_confdir (GNUPG_CONFDIR_USER, gnupg_homedir ());
 
   /* We are re-using the struct, thus the reset flag.  We OR the
    * flags so that the internal intialized flag won't be cleared. */
   argc = orig_argc;
   argv = orig_argv;
   pargs.argc = &argc;
   pargs.argv = &argv;
   pargs.flags |=  (ARGPARSE_FLAG_RESET
                    | ARGPARSE_FLAG_KEEP
                    | ARGPARSE_FLAG_SYS
                    | ARGPARSE_FLAG_USER);
   while (gnupg_argparser (&pargs, opts, DIRMNGR_NAME EXTSEP_S "conf"))
     {
       if (pargs.r_opt == ARGPARSE_CONFFILE)
         {
           if (debug_argparser)
             log_info (_("reading options from '%s'\n"),
                       pargs.r_type? pargs.r.ret_str: "[cmdline]");
           if (pargs.r_type)
             {
               xfree (last_configname);
               last_configname = xstrdup (pargs.r.ret_str);
               configname = last_configname;
             }
           else
             configname = NULL;
           continue;
         }
       if (parse_rereadable_options (&pargs, 0))
         continue; /* Already handled */
       switch (pargs.r_opt)
         {
         case aServer:
         case aDaemon:
         case aSupervised:
         case aShutdown:
         case aFlush:
 	case aListCRLs:
 	case aLoadCRL:
         case aFetchCRL:
 	case aGPGConfList:
 	case aGPGConfTest:
 	case aGPGConfVersions:
           cmd = pargs.r_opt;
           break;
 
         case oQuiet: opt.quiet = 1; break;
         case oVerbose: opt.verbose++; break;
         case oBatch: opt.batch=1; break;
 
         case oDebugWait: debug_wait = pargs.r.ret_int; break;
 
         case oNoGreeting: nogreeting = 1; break;
         case oNoVerbose: opt.verbose = 0; break;
         case oHomedir: /* Ignore this option here. */; break;
         case oNoDetach: nodetach = 1; break;
         case oStealSocket: steal_socket = 1; break;
         case oLogFile: logfile = pargs.r.ret_str; break;
         case oCsh: csh_style = 1; break;
         case oSh: csh_style = 0; break;
 	case oLDAPFile:
 #        if USE_LDAP
           ldapfile = pargs.r.ret_str;
 #        endif /*USE_LDAP*/
           break;
 	case oLDAPAddServers: opt.add_new_ldapservers = 1; break;
 
         case oFakedSystemTime:
           gnupg_set_time ((time_t)pargs.r.ret_ulong, 0);
           break;
 
         case oForce: opt.force = 1; break;
 
         case oSocketName: socket_name = pargs.r.ret_str; break;
 
         case oListenBacklog:
           listen_backlog = pargs.r.ret_int;
           break;
 
         default:
           if (configname)
             pargs.err = ARGPARSE_PRINT_WARNING;
           else
             pargs.err = ARGPARSE_PRINT_ERROR;
           break;
 	}
     }
   gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (!last_configname)
     opt.config_filename = make_filename (gnupg_homedir (),
                                          DIRMNGR_NAME EXTSEP_S "conf",
                                          NULL);
   else
     {
       opt.config_filename = last_configname;
       last_configname = NULL;
     }
 
   if (log_get_errorcount(0))
     exit(2);
   if (nogreeting )
     greeting = 0;
 
   if (!opt.homedir_cache)
     opt.homedir_cache = xstrdup (gnupg_homedir ());
 
   if (greeting)
     {
       es_fprintf (es_stderr, "%s %s; %s\n",
                   strusage(11), strusage(13), strusage(14) );
       es_fprintf (es_stderr, "%s\n", strusage(15) );
     }
 
 #ifdef IS_DEVELOPMENT_VERSION
   log_info ("NOTE: this is a development version!\n");
 #endif
 
   /* Print a warning if an argument looks like an option.  */
   if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
     {
       int i;
 
       for (i=0; i < argc; i++)
         if (argv[i][0] == '-' && argv[i][1] == '-')
           log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
   if (!gnupg_access ("/etc/"DIRMNGR_NAME, F_OK)
       && !strncmp (gnupg_homedir (), "/etc/", 5))
     log_info
       ("NOTE: DirMngr is now a proper part of %s.  The configuration and"
        " other directory names changed.  Please check that no other version"
        " of dirmngr is still installed.  To disable this warning, remove the"
        " directory '/etc/dirmngr'.\n", GNUPG_NAME);
 
   if (gnupg_faked_time_p ())
     {
       gnupg_isotime_t tbuf;
 
       log_info (_("WARNING: running with faked system time: "));
       gnupg_get_isotime (tbuf);
       dump_isotime (tbuf);
       log_printf ("\n");
     }
 
   post_option_parsing (cmd);
 
   /* Get LDAP server list from file unless --ldapserver has been used.  */
 #if USE_LDAP
   if (opt.ldapservers)
     ;
   else if (!ldapfile)
     {
       ldapfile = make_filename (gnupg_homedir (),
                                 "dirmngr_ldapservers.conf",
                                 NULL);
       opt.ldapservers = parse_ldapserver_file (ldapfile, 1);
       xfree (ldapfile);
     }
   else
     opt.ldapservers = parse_ldapserver_file (ldapfile, 0);
 #endif /*USE_LDAP*/
 
 #ifndef HAVE_W32_SYSTEM
   /* We need to ignore the PIPE signal because the we might log to a
      socket and that code handles EPIPE properly.  The ldap wrapper
      also requires us to ignore this silly signal. Assuan would set
      this signal to ignore anyway.*/
   signal (SIGPIPE, SIG_IGN);
 #endif
 
   /* Ready.  Now to our duties. */
   if (!cmd)
     cmd = aServer;
   rc = 0;
 
   if (cmd == aServer)
     {
       /* Note that this server mode is mainly useful for debugging.  */
       if (argc)
         wrong_args ("--server");
 
       if (logfile)
         {
           log_set_file (logfile);
           log_set_prefix (NULL, GPGRT_LOG_WITH_TIME | GPGRT_LOG_WITH_PID);
         }
 
       if (debug_wait)
         {
           log_debug ("waiting for debugger - my pid is %u .....\n",
                      (unsigned int)getpid());
           gnupg_sleep (debug_wait);
           log_debug ("... okay\n");
         }
 
 
       thread_init ();
       cert_cache_init (hkp_cacert_filenames);
       crl_cache_init ();
       http_register_netactivity_cb (netactivity_action);
       start_command_handler (ASSUAN_INVALID_FD, 0);
       shutdown_reaper ();
     }
 #ifndef HAVE_W32_SYSTEM
   else if (cmd == aSupervised)
     {
       /* In supervised mode, we expect file descriptor 3 to be an
          already opened, listening socket.
 
          We will also not detach from the controlling process or close
          stderr; the supervisor should handle all of that.  */
       struct stat statbuf;
       if (fstat (3, &statbuf) == -1 && errno == EBADF)
         {
           log_error ("file descriptor 3 must be validin --supervised mode\n");
           dirmngr_exit (1);
         }
       socket_name = gnupg_get_socket_name (3);
 
       /* Now start with logging to a file if this is desired. */
       if (logfile)
         {
           log_set_file (logfile);
           log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
                                  |GPGRT_LOG_WITH_TIME
                                  |GPGRT_LOG_WITH_PID));
           current_logfile = xstrdup (logfile);
         }
       else
         log_set_prefix (NULL, 0);
 
       thread_init ();
       cert_cache_init (hkp_cacert_filenames);
       crl_cache_init ();
       http_register_netactivity_cb (netactivity_action);
       handle_connections (3);
       shutdown_reaper ();
     }
 #endif /*HAVE_W32_SYSTEM*/
   else if (cmd == aDaemon)
     {
       assuan_fd_t fd;
       pid_t pid;
       int len;
       struct sockaddr_un serv_addr;
 
       if (argc)
         wrong_args ("--daemon");
 
       /* Now start with logging to a file if this is desired. */
       if (logfile)
         {
           log_set_file (logfile);
           log_set_prefix (NULL, (GPGRT_LOG_WITH_PREFIX
                                  |GPGRT_LOG_WITH_TIME
                                  |GPGRT_LOG_WITH_PID));
           current_logfile = xstrdup (logfile);
         }
 
       if (debug_wait)
         {
           log_debug ("waiting for debugger - my pid is %u .....\n",
                      (unsigned int)getpid());
           gnupg_sleep (debug_wait);
           log_debug ("... okay\n");
         }
 
 #ifndef HAVE_W32_SYSTEM
       if (strchr (socket_name, ':'))
         {
           log_error (_("colons are not allowed in the socket name\n"));
           dirmngr_exit (1);
         }
 #endif
       fd = assuan_sock_new (AF_UNIX, SOCK_STREAM, 0);
       if (fd == ASSUAN_INVALID_FD)
         {
           log_error (_("can't create socket: %s\n"), strerror (errno));
           cleanup ();
           dirmngr_exit (1);
         }
 
       {
         int redirected;
 
         if (assuan_sock_set_sockaddr_un (socket_name,
                                          (struct sockaddr*)&serv_addr,
                                          &redirected))
           {
             if (errno == ENAMETOOLONG)
               log_error (_("socket name '%s' is too long\n"), socket_name);
             else
               log_error ("error preparing socket '%s': %s\n",
                          socket_name,
                          gpg_strerror (gpg_error_from_syserror ()));
             dirmngr_exit (1);
           }
         if (redirected)
           {
             redir_socket_name = xstrdup (serv_addr.sun_path);
             if (opt.verbose)
               log_info ("redirecting socket '%s' to '%s'\n",
                         socket_name, redir_socket_name);
           }
       }
 
       len = SUN_LEN (&serv_addr);
 
       rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
       if (rc == -1
           && (errno == EADDRINUSE
 #ifdef HAVE_W32_SYSTEM
               || errno == EEXIST
 #endif
               ))
 	{
           /* Fixme: We should actually test whether a dirmngr is
            * already running.  For now the steal option is a dummy. */
           /* if (steal_socket) */
           /*   log_info (N_("trying to steal socket from running %s\n"), */
           /*             "dirmngr"); */
 	  gnupg_remove (redir_socket_name? redir_socket_name : socket_name);
 	  rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
 	}
       if (rc != -1
 	  && (rc = assuan_sock_get_nonce ((struct sockaddr*) &serv_addr, len, &socket_nonce)))
 	log_error (_("error getting nonce for the socket\n"));
       if (rc == -1)
         {
           log_error (_("error binding socket to '%s': %s\n"),
                      serv_addr.sun_path,
                      gpg_strerror (gpg_error_from_syserror ()));
           assuan_sock_close (fd);
           dirmngr_exit (1);
         }
       cleanup_socket = 1;
 
       if (gnupg_chmod (serv_addr.sun_path, "-rwx"))
         log_error (_("can't set permissions of '%s': %s\n"),
                    serv_addr.sun_path, strerror (errno));
 
       if (listen (FD2INT (fd), listen_backlog) == -1)
         {
           log_error ("listen(fd,%d) failed: %s\n",
                      listen_backlog, strerror (errno));
           assuan_sock_close (fd);
           dirmngr_exit (1);
         }
 
       if (opt.verbose)
         log_info (_("listening on socket '%s'\n"), serv_addr.sun_path);
 
       es_fflush (NULL);
 
       /* Note: We keep the dirmngr_info output only for the sake of
          existing scripts which might use this to detect a successful
          start of the dirmngr.  */
 #ifdef HAVE_W32_SYSTEM
       (void)csh_style;
       (void)nodetach;
 
       pid = getpid ();
       es_printf ("set %s=%s;%lu;1\n",
                  DIRMNGR_INFO_NAME, socket_name, (ulong) pid);
 #else
       pid = fork();
       if (pid == (pid_t)-1)
         {
           log_fatal (_("error forking process: %s\n"), strerror (errno));
           dirmngr_exit (1);
         }
 
       if (pid)
         { /* We are the parent */
           char *infostr;
 
           /* Don't let cleanup() remove the socket - the child is
              responsible for doing that.  */
           cleanup_socket = 0;
 
           close (fd);
 
           /* Create the info string: <name>:<pid>:<protocol_version> */
           if (asprintf (&infostr, "%s=%s:%lu:1",
                         DIRMNGR_INFO_NAME, serv_addr.sun_path, (ulong)pid ) < 0)
             {
               log_error (_("out of core\n"));
               kill (pid, SIGTERM);
               dirmngr_exit (1);
             }
           /* Print the environment string, so that the caller can use
              shell's eval to set it.  But see above.  */
           if (csh_style)
             {
               *strchr (infostr, '=') = ' ';
               es_printf ( "setenv %s;\n", infostr);
             }
           else
             {
               es_printf ( "%s; export %s;\n", infostr, DIRMNGR_INFO_NAME);
             }
           free (infostr);
           exit (0);
           /*NEVER REACHED*/
         } /* end parent */
 
 
       /*
          This is the child
        */
 
       /* Detach from tty and put process into a new session */
       if (!nodetach )
         {
           int i;
           unsigned int oldflags;
 
           /* Close stdin, stdout and stderr unless it is the log stream */
           for (i=0; i <= 2; i++)
             {
               if (!log_test_fd (i) && i != fd )
                 {
                   if ( !close (i)
                        && open ("/dev/null", i? O_WRONLY : O_RDONLY) == -1)
                     {
                       log_error ("failed to open '%s': %s\n",
                                  "/dev/null", strerror (errno));
                       cleanup ();
                       dirmngr_exit (1);
                     }
                 }
             }
 
           if (setsid() == -1)
             {
               log_error ("setsid() failed: %s\n", strerror(errno) );
               dirmngr_exit (1);
             }
 
           log_get_prefix (&oldflags);
           log_set_prefix (NULL, oldflags | GPGRT_LOG_RUN_DETACHED);
           opt.running_detached = 1;
 
         }
 #endif
 
       if (!nodetach )
         {
           if (gnupg_chdir (gnupg_daemon_rootdir ()))
             {
               log_error ("chdir to '%s' failed: %s\n",
                          gnupg_daemon_rootdir (), strerror (errno));
               dirmngr_exit (1);
             }
         }
 
       thread_init ();
       cert_cache_init (hkp_cacert_filenames);
       crl_cache_init ();
       http_register_netactivity_cb (netactivity_action);
       handle_connections (fd);
       shutdown_reaper ();
     }
   else if (cmd == aListCRLs)
     {
       /* Just list the CRL cache and exit. */
       if (argc)
         wrong_args ("--list-crls");
       crl_cache_init ();
       crl_cache_list (es_stdout);
     }
   else if (cmd == aLoadCRL)
     {
       struct server_control_s ctrlbuf;
 
       memset (&ctrlbuf, 0, sizeof ctrlbuf);
       dirmngr_init_default_ctrl (&ctrlbuf);
 
       thread_init ();
       cert_cache_init (hkp_cacert_filenames);
       crl_cache_init ();
       if (!argc)
         rc = crl_cache_load (&ctrlbuf, NULL);
       else
         {
           for (; !rc && argc; argc--, argv++)
             rc = crl_cache_load (&ctrlbuf, *argv);
         }
       dirmngr_deinit_default_ctrl (&ctrlbuf);
     }
   else if (cmd == aFetchCRL)
     {
       ksba_reader_t reader;
       struct server_control_s ctrlbuf;
 
       if (argc != 1)
         wrong_args ("--fetch-crl URL");
 
       memset (&ctrlbuf, 0, sizeof ctrlbuf);
       dirmngr_init_default_ctrl (&ctrlbuf);
 
       thread_init ();
       cert_cache_init (hkp_cacert_filenames);
       crl_cache_init ();
       rc = crl_fetch (&ctrlbuf, argv[0], &reader);
       if (rc)
         log_error (_("fetching CRL from '%s' failed: %s\n"),
                      argv[0], gpg_strerror (rc));
       else
         {
           rc = crl_cache_insert (&ctrlbuf, argv[0], reader);
           if (rc)
             log_error (_("processing CRL from '%s' failed: %s\n"),
                        argv[0], gpg_strerror (rc));
           crl_close_reader (reader);
         }
       dirmngr_deinit_default_ctrl (&ctrlbuf);
     }
   else if (cmd == aFlush)
     {
       /* Delete cache and exit. */
       if (argc)
         wrong_args ("--flush");
       rc = crl_cache_flush();
     }
   else if (cmd == aGPGConfTest)
     dirmngr_exit (0);
   else if (cmd == aGPGConfList)
     {
       unsigned long flags = 0;
       char *filename_esc;
 
       es_printf ("debug-level:%lu:\"none\n", flags | GC_OPT_FLAG_DEFAULT);
       es_printf ("ldaptimeout:%lu:%u\n",
                  flags | GC_OPT_FLAG_DEFAULT, DEFAULT_LDAP_TIMEOUT);
       es_printf ("max-replies:%lu:%u\n",
                  flags | GC_OPT_FLAG_DEFAULT, DEFAULT_MAX_REPLIES);
 
       filename_esc = percent_escape (get_default_keyserver (0), NULL);
       es_printf ("keyserver:%lu:\"%s:\n", flags | GC_OPT_FLAG_DEFAULT,
                  filename_esc);
       xfree (filename_esc);
 
       es_printf ("resolver-timeout:%lu:%u\n",
                  flags | GC_OPT_FLAG_DEFAULT, 0);
     }
   else if (cmd == aGPGConfVersions)
     gpgconf_versions ();
 
   cleanup ();
   return !!rc;
 }
 
 
 static void
 cleanup (void)
 {
   crl_cache_deinit ();
   cert_cache_deinit (1);
   reload_dns_stuff (1);
 
 #if USE_LDAP
   ldapserver_list_free (opt.ldapservers);
 #endif /*USE_LDAP*/
   opt.ldapservers = NULL;
 
   if (cleanup_socket)
     {
       cleanup_socket = 0;
       if (redir_socket_name)
         gnupg_remove (redir_socket_name);
       else if (socket_name && *socket_name)
         gnupg_remove (socket_name);
     }
 }
 
 
 void
 dirmngr_exit (int rc)
 {
   cleanup ();
   exit (rc);
 }
 
 
 void
 dirmngr_init_default_ctrl (ctrl_t ctrl)
 {
   ctrl->magic = SERVER_CONTROL_MAGIC;
   if (opt.http_proxy)
     ctrl->http_proxy = xstrdup (opt.http_proxy);
   ctrl->http_no_crl = 1;
   ctrl->timeout = opt.connect_timeout;
 }
 
 
 void
 dirmngr_deinit_default_ctrl (ctrl_t ctrl)
 {
   if (!ctrl)
     return;
   ctrl->magic = 0xdeadbeef;
 
   xfree (ctrl->http_proxy);
   ctrl->http_proxy = NULL;
   nvc_release (ctrl->rootdse);
   ctrl->rootdse = NULL;
 }
 
 
 /* Create a list of LDAP servers from the file FILENAME. Returns the
    list or NULL in case of errors.
 
    The format fo such a file is line oriented where empty lines and
    lines starting with a hash mark are ignored.  All other lines are
    assumed to be colon seprated with these fields:
 
    1. field: Hostname
    2. field: Portnumber
    3. field: Username
    4. field: Password
    5. field: Base DN
 
 */
 #if USE_LDAP
 static ldap_server_t
 parse_ldapserver_file (const char* filename, int ignore_enoent)
 {
   char buffer[1024];
   char *p;
   ldap_server_t server, serverstart, *serverend;
   int c;
   unsigned int lineno = 0;
   estream_t fp;
 
   fp = es_fopen (filename, "r");
   if (!fp)
     {
       if (errno == ENOENT)
         {
           if (!ignore_enoent)
             log_info ("No ldapserver file at: '%s'\n", filename);
         }
       else
         log_error (_("error opening '%s': %s\n"), filename,
                    strerror (errno));
       return NULL;
     }
 
   serverstart = NULL;
   serverend = &serverstart;
   while (es_fgets (buffer, sizeof buffer, fp))
     {
       lineno++;
       if (!*buffer || buffer[strlen(buffer)-1] != '\n')
         {
           if (*buffer && es_feof (fp))
             ; /* Last line not terminated - continue. */
           else
             {
               log_error (_("%s:%u: line too long - skipped\n"),
                          filename, lineno);
               while ( (c=es_fgetc (fp)) != EOF && c != '\n')
                 ; /* Skip until end of line. */
               continue;
             }
         }
       /* Skip empty and comment lines.*/
       for (p=buffer; spacep (p); p++)
         ;
       if (!*p || *p == '\n' || *p == '#')
         continue;
 
       /* Parse the colon separated fields. */
       server = ldapserver_parse_one (buffer, filename, lineno);
       if (server)
         {
           *serverend = server;
           serverend = &server->next;
         }
     }
 
   if (es_ferror (fp))
     log_error (_("error reading '%s': %s\n"), filename, strerror (errno));
   es_fclose (fp);
 
   return serverstart;
 }
 #endif /*USE_LDAP*/
 
 
 /* Parse a fingerprint entry as used by --ocsc-signer.  OPTIONNAME as
  * a description on the options used.  WANT_BINARY requests to store a
  * binary fingerprint.  Returns NULL on error and logs that error. */
 static fingerprint_list_t
 parse_fingerprint_item (const char *string,
                         const char *optionname, int want_binary)
 {
   gpg_error_t err;
   char *fname;
   estream_t fp;
   char line[256];
   char *p;
   fingerprint_list_t list, *list_tail, item;
   unsigned int lnr = 0;
   int c, i, j;
   int errflag = 0;
 
 
   /* Check whether this is not a filename and treat it as a direct
      fingerprint specification.  */
   if (!strpbrk (string, "/.~\\"))
     {
       item = xcalloc (1, sizeof *item);
       for (i=j=0; (string[i] == ':' || hexdigitp (string+i)) && j < 40; i++)
         if ( string[i] != ':' )
           item->hexfpr[j++] = string[i] >= 'a'? (string[i] & 0xdf): string[i];
       item->hexfpr[j] = 0;
       if (j != 40 || !(spacep (string+i) || !string[i]))
         {
           log_error (_("%s:%u: invalid fingerprint detected\n"),
                      optionname, 0);
           xfree (item);
           return NULL;
         }
       if (want_binary)
         {
           item->binlen = 20;
           hex2bin (item->hexfpr, item->hexfpr, 20);
         }
       return item;
     }
 
   /* Well, it is a filename.  */
   if (*string == '/' || (*string == '~' && string[1] == '/'))
     fname = make_filename (string, NULL);
   else
     {
       if (string[0] == '.' && string[1] == '/' )
         string += 2;
       fname = make_filename (gnupg_homedir (), string, NULL);
     }
 
   fp = es_fopen (fname, "r");
   if (!fp)
     {
       err = gpg_error_from_syserror ();
       log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err));
       xfree (fname);
       return NULL;
     }
 
   list = NULL;
   list_tail = &list;
   for (;;)
     {
       if (!es_fgets (line, DIM(line)-1, fp) )
         {
           if (!es_feof (fp))
             {
               err = gpg_error_from_syserror ();
               log_error (_("%s:%u: read error: %s\n"),
                          fname, lnr, gpg_strerror (err));
               errflag = 1;
             }
           es_fclose (fp);
           if (errflag)
             {
               while (list)
                 {
                   fingerprint_list_t tmp = list->next;
                   xfree (list);
                   list = tmp;
                 }
             }
           xfree (fname);
           return list; /* Ready.  */
         }
 
       lnr++;
       if (!*line || line[strlen(line)-1] != '\n')
         {
           /* Eat until end of line. */
           while ( (c=es_getc (fp)) != EOF && c != '\n')
             ;
           err = gpg_error (*line? GPG_ERR_LINE_TOO_LONG
                            /* */: GPG_ERR_INCOMPLETE_LINE);
           log_error (_("%s:%u: read error: %s\n"),
                      fname, lnr, gpg_strerror (err));
           errflag = 1;
           continue;
         }
 
       /* Allow for empty lines and spaces */
       for (p=line; spacep (p); p++)
         ;
       if (!*p || *p == '\n' || *p == '#')
         continue;
 
       item = xcalloc (1, sizeof *item);
       *list_tail = item;
       list_tail = &item->next;
 
       for (i=j=0; (p[i] == ':' || hexdigitp (p+i)) && j < 40; i++)
         if ( p[i] != ':' )
           item->hexfpr[j++] = p[i] >= 'a'? (p[i] & 0xdf): p[i];
       item->hexfpr[j] = 0;
       if (j != 40 || !(spacep (p+i) || p[i] == '\n'))
         {
           log_error (_("%s:%u: invalid fingerprint detected\n"), fname, lnr);
           errflag = 1;
         }
       else if (want_binary)
         {
           item->binlen = 20;
           hex2bin (item->hexfpr, item->hexfpr, 20);
         }
 
       i++;
       while (spacep (p+i))
         i++;
       if (p[i] && p[i] != '\n')
         log_info (_("%s:%u: garbage at end of line ignored\n"), fname, lnr);
     }
   /*NOTREACHED*/
 }
 
 
 
 
 /*
    Stuff used in daemon mode.
  */
 
 
 
 /* Reread parts of the configuration.  Note, that this function is
    obviously not thread-safe and should only be called from the NPTH
    signal handler.
 
    Fixme: Due to the way the argument parsing works, we create a
    memory leak here for all string type arguments.  There is currently
    no clean way to tell whether the memory for the argument has been
    allocated or points into the process' original arguments.  Unless
    we have a mechanism to tell this, we need to live on with this. */
 static void
 reread_configuration (void)
 {
   ARGPARSE_ARGS pargs;
   char *twopart;
   int dummy;
 
   if (!opt.config_filename)
     return; /* No config file. */
 
   twopart = strconcat (DIRMNGR_NAME EXTSEP_S "conf" PATHSEP_S,
                        opt.config_filename, NULL);
   if (!twopart)
     return;  /* Out of core.  */
 
   parse_rereadable_options (NULL, 1); /* Start from the default values. */
 
   memset (&pargs, 0, sizeof pargs);
   dummy = 0;
   pargs.argc = &dummy;
   pargs.flags = (ARGPARSE_FLAG_KEEP
                  |ARGPARSE_FLAG_SYS
                  |ARGPARSE_FLAG_USER);
   while (gnupg_argparser (&pargs, opts, twopart))
     {
       if (pargs.r_opt == ARGPARSE_CONFFILE)
         {
           log_info (_("reading options from '%s'\n"),
                     pargs.r_type? pargs.r.ret_str: "[cmdline]");
         }
       else if (pargs.r_opt < -1)
         pargs.err = ARGPARSE_PRINT_WARNING;
       else /* Try to parse this option - ignore unchangeable ones. */
         parse_rereadable_options (&pargs, 1);
     }
   gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
   xfree (twopart);
   post_option_parsing (0);
 }
 
 
 /* A global function which allows us to trigger the reload stuff from
    other places.  */
 void
 dirmngr_sighup_action (void)
 {
   log_info (_("SIGHUP received - "
               "re-reading configuration and flushing caches\n"));
   reread_configuration ();
   cert_cache_deinit (0);
   crl_cache_deinit ();
   cert_cache_init (hkp_cacert_filenames);
   crl_cache_init ();
+  http_reinitialize ();
   reload_dns_stuff (0);
   ks_hkp_reload ();
 }
 
 
 /* This function is called if some network activity was done.  At this
  * point we know the we have a network and we can decide whether to
  * run scheduled background tasks soon.  The function should return
  * quickly and only trigger actions for another thread. */
 static void
 netactivity_action (void)
 {
   network_activity_seen = 1;
 }
 
 
 /* The signal handler. */
 #ifndef HAVE_W32_SYSTEM
 static void
 handle_signal (int signo)
 {
   switch (signo)
     {
     case SIGHUP:
       dirmngr_sighup_action ();
       break;
 
     case SIGUSR1:
       cert_cache_print_stats ();
       domaininfo_print_stats ();
       break;
 
     case SIGUSR2:
       log_info (_("SIGUSR2 received - no action defined\n"));
       break;
 
     case SIGTERM:
       if (!shutdown_pending)
         log_info (_("SIGTERM received - shutting down ...\n"));
       else
         log_info (_("SIGTERM received - still %d active connections\n"),
                   active_connections);
       shutdown_pending++;
       if (shutdown_pending > 2)
         {
           log_info (_("shutdown forced\n"));
           log_info ("%s %s stopped\n", strusage(11), strusage(13) );
           cleanup ();
           dirmngr_exit (0);
 	}
       break;
 
     case SIGINT:
       log_info (_("SIGINT received - immediate shutdown\n"));
       log_info( "%s %s stopped\n", strusage(11), strusage(13));
       cleanup ();
       dirmngr_exit (0);
       break;
 
     default:
       log_info (_("signal %d received - no action defined\n"), signo);
     }
 }
 #endif /*!HAVE_W32_SYSTEM*/
 
 
 /* Thread to do the housekeeping.  */
 static void *
 housekeeping_thread (void *arg)
 {
   static int sentinel;
   time_t curtime;
   struct server_control_s ctrlbuf;
 
   (void)arg;
 
   curtime = gnupg_get_time ();
   if (sentinel)
     {
       log_info ("housekeeping is already going on\n");
       return NULL;
     }
   sentinel++;
   if (opt.verbose > 1)
     log_info ("starting housekeeping\n");
 
   memset (&ctrlbuf, 0, sizeof ctrlbuf);
   dirmngr_init_default_ctrl (&ctrlbuf);
 
   dns_stuff_housekeeping ();
   ks_hkp_housekeeping (curtime);
   if (network_activity_seen)
     {
       network_activity_seen = 0;
       if (opt.allow_version_check)
         dirmngr_load_swdb (&ctrlbuf, 0);
       workqueue_run_global_tasks (&ctrlbuf, 1);
     }
   else
     workqueue_run_global_tasks (&ctrlbuf, 0);
 
   dirmngr_deinit_default_ctrl (&ctrlbuf);
 
   if (opt.verbose > 1)
     log_info ("ready with housekeeping\n");
   sentinel--;
   return NULL;
 
 }
 
 
 #if GPGRT_GCC_HAVE_PUSH_PRAGMA
 # pragma GCC push_options
 # pragma GCC optimize ("no-strict-overflow")
 #endif
 static int
 time_for_housekeeping_p (time_t curtime)
 {
   static time_t last_housekeeping;
 
   if (!last_housekeeping)
     last_housekeeping = curtime;
 
   if (last_housekeeping + HOUSEKEEPING_INTERVAL <= curtime
       || last_housekeeping > curtime /*(be prepared for y2038)*/)
     {
       last_housekeeping = curtime;
       return 1;
     }
   return 0;
 }
 #if GPGRT_GCC_HAVE_PUSH_PRAGMA
 # pragma GCC pop_options
 #endif
 
 
 /* This is the worker for the ticker.  It is called every few seconds
    and may only do fast operations. */
 static void
 handle_tick (void)
 {
   struct stat statbuf;
 
   if (time_for_housekeeping_p (gnupg_get_time ()))
     {
       npth_t thread;
       npth_attr_t tattr;
       int err;
 
       err = npth_attr_init (&tattr);
       if (err)
         log_error ("error preparing housekeeping thread: %s\n", strerror (err));
       else
         {
           npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
           err = npth_create (&thread, &tattr, housekeeping_thread, NULL);
           if (err)
             log_error ("error spawning housekeeping thread: %s\n",
                        strerror (err));
           npth_attr_destroy (&tattr);
         }
     }
 
   /* Check whether the homedir is still available.  */
   if (!shutdown_pending
       && gnupg_stat (gnupg_homedir (), &statbuf) && errno == ENOENT)
     {
       shutdown_pending = 1;
       log_info ("homedir has been removed - shutting down\n");
     }
 }
 
 
 /* Check the nonce on a new connection.  This is a NOP unless we are
    using our Unix domain socket emulation under Windows.  */
 static int
 check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
 {
   if (assuan_sock_check_nonce (fd, nonce))
     {
       log_info (_("error reading nonce on fd %d: %s\n"),
                 FD2INT (fd), strerror (errno));
       assuan_sock_close (fd);
       return -1;
     }
   else
     return 0;
 }
 
 
 /* Helper to call a connection's main function. */
 static void *
 start_connection_thread (void *arg)
 {
   static unsigned int last_session_id;
   unsigned int session_id;
   union int_and_ptr_u argval;
   gnupg_fd_t fd;
 
   memset (&argval, 0, sizeof argval);
   argval.aptr = arg;
   fd = argval.afd;
 
   if (check_nonce (fd, &socket_nonce))
     {
       log_error ("handler nonce check FAILED\n");
       return NULL;
     }
 
 #ifndef HAVE_W32_SYSTEM
   npth_setspecific (my_tlskey_current_fd, argval.aptr);
 #endif
 
   active_connections++;
   if (opt.verbose)
     log_info (_("handler for fd %d started\n"), FD2INT (fd));
 
   session_id = ++last_session_id;
   if (!session_id)
     session_id = ++last_session_id;
   start_command_handler (fd, session_id);
 
   if (opt.verbose)
     log_info (_("handler for fd %d terminated\n"), FD2INT (fd));
   active_connections--;
 
   workqueue_run_post_session_tasks (session_id);
 
 #ifndef HAVE_W32_SYSTEM
   argval.afd = ASSUAN_INVALID_FD;
   npth_setspecific (my_tlskey_current_fd, argval.aptr);
 #endif
 
   return NULL;
 }
 
 
 #ifdef HAVE_INOTIFY_INIT
 /* Read an inotify event and return true if it matches NAME.  */
 static int
 my_inotify_is_name (int fd, const char *name)
 {
   union {
     struct inotify_event ev;
     char _buf[sizeof (struct inotify_event) + 100 + 1];
   } buf;
   int n;
   const char *s;
 
   s = strrchr (name, '/');
   if (s && s[1])
     name = s + 1;
 
   n = npth_read (fd, &buf, sizeof buf);
   if (n < sizeof (struct inotify_event))
     return 0;
   if (buf.ev.len < strlen (name)+1)
     return 0;
   if (strcmp (buf.ev.name, name))
     return 0; /* Not the desired file.  */
 
   return 1; /* Found.  */
 }
 #endif /*HAVE_INOTIFY_INIT*/
 
 
 /* Main loop in daemon mode.  Note that LISTEN_FD will be owned by
  * this function. */
 static void
 handle_connections (assuan_fd_t listen_fd)
 {
   npth_attr_t tattr;
 #ifndef HAVE_W32_SYSTEM
   int signo;
 #endif
   struct sockaddr_un paddr;
   socklen_t plen = sizeof( paddr );
   int nfd, ret;
   fd_set fdset, read_fdset;
   struct timespec abstime;
   struct timespec curtime;
   struct timespec timeout;
   int saved_errno;
   int my_inotify_fd = -1;
 
   npth_attr_init (&tattr);
   npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
 
 #ifndef HAVE_W32_SYSTEM /* FIXME */
   npth_sigev_init ();
   npth_sigev_add (SIGHUP);
   npth_sigev_add (SIGUSR1);
   npth_sigev_add (SIGUSR2);
   npth_sigev_add (SIGINT);
   npth_sigev_add (SIGTERM);
   npth_sigev_fini ();
 #endif
 
 #ifdef HAVE_INOTIFY_INIT
   if (disable_check_own_socket)
     my_inotify_fd = -1;
   else if ((my_inotify_fd = inotify_init ()) == -1)
     log_info ("error enabling fast daemon termination: %s\n",
               strerror (errno));
   else
     {
       /* We need to watch the directory for the file because there
        * won't be an IN_DELETE_SELF for a socket file.  */
       char *slash = strrchr (socket_name, '/');
       log_assert (slash && slash[1]);
       *slash = 0;
       if (inotify_add_watch (my_inotify_fd, socket_name, IN_DELETE) == -1)
         {
           close (my_inotify_fd);
           my_inotify_fd = -1;
         }
       *slash = '/';
     }
 #endif /*HAVE_INOTIFY_INIT*/
 
 
   /* Setup the fdset.  It has only one member.  This is because we use
      pth_select instead of pth_accept to properly sync timeouts with
      to full second.  */
   FD_ZERO (&fdset);
   FD_SET (FD2INT (listen_fd), &fdset);
   nfd = FD2INT (listen_fd);
   if (my_inotify_fd != -1)
     {
       FD_SET (my_inotify_fd, &fdset);
       if (my_inotify_fd > nfd)
         nfd = my_inotify_fd;
     }
 
   npth_clock_gettime (&abstime);
   abstime.tv_sec += TIMERTICK_INTERVAL;
 
   /* Main loop.  */
   for (;;)
     {
       /* Shutdown test.  */
       if (shutdown_pending)
         {
           if (!active_connections)
             break; /* ready */
 
           /* Do not accept new connections but keep on running the
            * loop to cope with the timer events.
            *
            * Note that we do not close the listening socket because a
            * client trying to connect to that socket would instead
            * restart a new dirmngr instance - which is unlikely the
            * intention of a shutdown. */
           /* assuan_sock_close (listen_fd); */
           /* listen_fd = -1; */
           FD_ZERO (&fdset);
           nfd = -1;
           if (my_inotify_fd != -1)
             {
               FD_SET (my_inotify_fd, &fdset);
               nfd = my_inotify_fd;
             }
 	}
 
       /* Take a copy of the fdset.  */
       read_fdset = fdset;
 
       npth_clock_gettime (&curtime);
       if (!(npth_timercmp (&curtime, &abstime, <)))
 	{
 	  /* Timeout.  When a shutdown is pending we use a shorter
            * interval to handle the shutdown more quickly.  */
 	  handle_tick ();
 	  npth_clock_gettime (&abstime);
 	  abstime.tv_sec += (shutdown_pending
                              ? TIMERTICK_INTERVAL_SHUTDOWN
                              : TIMERTICK_INTERVAL);
 	}
       npth_timersub (&abstime, &curtime, &timeout);
 
 #ifndef HAVE_W32_SYSTEM
       ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout,
                           npth_sigev_sigmask());
       saved_errno = errno;
 
       while (npth_sigev_get_pending(&signo))
 	handle_signal (signo);
 #else
       ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout, NULL, NULL);
       saved_errno = errno;
 #endif
 
       if (ret == -1 && saved_errno != EINTR)
 	{
           log_error (_("npth_pselect failed: %s - waiting 1s\n"),
                      strerror (saved_errno));
           npth_sleep (1);
           continue;
 	}
 
       if (ret <= 0)
         {
           /* Interrupt or timeout.  Will be handled when calculating the
              next timeout.  */
           continue;
         }
 
       if (shutdown_pending)
         {
           /* Do not anymore accept connections.  */
           continue;
         }
 
 #ifdef HAVE_INOTIFY_INIT
       if (my_inotify_fd != -1 && FD_ISSET (my_inotify_fd, &read_fdset)
           && my_inotify_is_name (my_inotify_fd, socket_name))
         {
           shutdown_pending = 1;
           log_info ("socket file has been removed - shutting down\n");
         }
 #endif /*HAVE_INOTIFY_INIT*/
 
       if (FD_ISSET (FD2INT (listen_fd), &read_fdset))
 	{
           gnupg_fd_t fd;
 
           plen = sizeof paddr;
 	  fd = INT2FD (npth_accept (FD2INT(listen_fd),
 				    (struct sockaddr *)&paddr, &plen));
 	  if (fd == GNUPG_INVALID_FD)
 	    {
 	      log_error ("accept failed: %s\n", strerror (errno));
 	    }
           else
             {
               char threadname[50];
               union int_and_ptr_u argval;
 	      npth_t thread;
 
               memset (&argval, 0, sizeof argval);
               argval.afd = fd;
               snprintf (threadname, sizeof threadname,
                         "conn fd=%d", FD2INT(fd));
 
               ret = npth_create (&thread, &tattr,
                                  start_connection_thread, argval.aptr);
 	      if (ret)
                 {
                   log_error ("error spawning connection handler: %s\n",
                              strerror (ret) );
                   assuan_sock_close (fd);
                 }
 	      npth_setname_np (thread, threadname);
             }
 	}
     }
 
 #ifdef HAVE_INOTIFY_INIT
   if (my_inotify_fd != -1)
     close (my_inotify_fd);
 #endif /*HAVE_INOTIFY_INIT*/
   npth_attr_destroy (&tattr);
   if (listen_fd != GNUPG_INVALID_FD)
     assuan_sock_close (listen_fd);
   cleanup ();
   log_info ("%s %s stopped\n", strusage(11), strusage(13));
 }
 
 const char*
 dirmngr_get_current_socket_name (void)
 {
   if (socket_name)
     return socket_name;
   else
     return dirmngr_socket_name ();
 }
 
 
 
 /* Parse the revision part from the extended version blurb.  */
 static const char *
 get_revision_from_blurb (const char *blurb, int *r_len)
 {
   const char *s = blurb? blurb : "";
   int n;
 
   for (; *s; s++)
     if (*s == '\n' && s[1] == '(')
       break;
   if (*s)
     {
       s += 2;
       for (n=0; s[n] && s[n] != ' '; n++)
         ;
     }
   else
     {
       s = "?";
       n = 1;
     }
   *r_len = n;
   return s;
 }
 
 
 /* Print versions of dirmngr and used libraries.  This is used by
  * "gpgconf --show-versions" so that there is no need to link gpgconf
  * against all these libraries.  This is an internal API and should
  * not be relied upon.  */
 static void
 gpgconf_versions (void)
 {
   const char *s;
   int n;
 
   /* Unfortunately Npth has no way to get the version.  */
 
   s = get_revision_from_blurb (assuan_check_version ("\x01\x01"), &n);
   es_fprintf (es_stdout, "* Libassuan %s (%.*s)\n\n",
               assuan_check_version (NULL), n, s);
 
   s = get_revision_from_blurb (ksba_check_version ("\x01\x01"), &n);
   es_fprintf (es_stdout, "* KSBA %s (%.*s)\n\n",
               ksba_check_version (NULL), n, s);
 
 #ifdef HTTP_USE_NTBTLS
   s = get_revision_from_blurb (ntbtls_check_version ("\x01\x01"), &n);
   es_fprintf (es_stdout, "* NTBTLS %s (%.*s)\n\n",
               ntbtls_check_version (NULL), n, s);
 #elif HTTP_USE_GNUTLS
   es_fprintf (es_stdout, "* GNUTLS %s\n\n",
               gnutls_check_version (NULL));
 #endif
 
 }
diff --git a/dirmngr/http-common.h b/dirmngr/http-common.h
index 5e6657b16..ddb340de6 100644
--- a/dirmngr/http-common.h
+++ b/dirmngr/http-common.h
@@ -1,25 +1,27 @@
 /* http-common.h - Defs for common support for TLS implementations.
  * Copyright (C) 2017  Werner Koch
  *
  * This file is part of GnuPG.
  *
  * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef HTTP_COMMON_H
 #define HTTP_COMMON_H
 
 const char *get_default_keyserver (int name_only);
 
+void http_reinitialize (void);
+
 #endif /* HTTP_COMMON_H */
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 9d6438a3b..44db43f46 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -1,3897 +1,4053 @@
 /* http.c  -  HTTP protocol handler
  * Copyright (C) 1999, 2001-2004, 2006, 2009, 2010,
  *               2011 Free Software Foundation, Inc.
  * Copyright (C) 1999, 2001-2004, 2006, 2009, 2010, 2011, 2014 Werner Koch
  * Copyright (C) 2015-2017, 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of either
  *
  *   - the GNU Lesser General Public License as published by the Free
  *     Software Foundation; either version 3 of the License, or (at
  *     your option) any later version.
  *
  * or
  *
  *   - the GNU General Public License as published by the Free
  *     Software Foundation; either version 2 of the License, or (at
  *     your option) any later version.
  *
  * or both in parallel, as here.
  *
  * This file is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /* Simple HTTP client implementation.  We try to keep the code as
    self-contained as possible.  There are some constraints however:
 
   - estream is required.  We now require estream because it provides a
     very useful and portable asprintf implementation and the fopencookie
     function.
   - stpcpy is required
   - fixme: list other requirements.
 
 
   - With HTTP_USE_NTBTLS or HTTP_USE_GNUTLS support for https is
     provided (this also requires estream).
 
   - With HTTP_NO_WSASTARTUP the socket initialization is not done
     under Windows.  This is useful if the socket layer has already
     been initialized elsewhere.  This also avoids the installation of
     an exit handler to cleanup the socket layer.
 */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
 
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
 # endif
 # include <windows.h>
+# include <winhttp.h>
 #else /*!HAVE_W32_SYSTEM*/
 # include <sys/types.h>
 # include <sys/socket.h>
 # include <sys/time.h>
 # include <time.h>
 # include <fcntl.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>
 # include <netdb.h>
 #endif /*!HAVE_W32_SYSTEM*/
 
 #ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth.  */
 # undef USE_NPTH
 #endif
 
 #ifdef USE_NPTH
 # include <npth.h>
 #endif
 
 #if defined (HTTP_USE_GNUTLS) && defined (HTTP_USE_NTBTLS)
 # error Both, HTTP_USE_GNUTLS and HTTP_USE_NTBTLS, are defined.
 #endif
 
 #ifdef HTTP_USE_NTBTLS
 # include <ntbtls.h>
 #elif HTTP_USE_GNUTLS
 # include <gnutls/gnutls.h>
 # include <gnutls/x509.h>
 #endif /*HTTP_USE_GNUTLS*/
 
 #include <assuan.h>  /* We need the socket wrapper.  */
 
 #include "../common/util.h"
 #include "../common/i18n.h"
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 #include "dns-stuff.h"
 #include "dirmngr-status.h"    /* (dirmngr_status_printf)  */
 #include "http.h"
 #include "http-common.h"
 
 
 #ifdef USE_NPTH
 # define my_select(a,b,c,d,e)  npth_select ((a), (b), (c), (d), (e))
 # define my_accept(a,b,c)      npth_accept ((a), (b), (c))
 #else
 # define my_select(a,b,c,d,e)  select ((a), (b), (c), (d), (e))
 # define my_accept(a,b,c)      accept ((a), (b), (c))
 #endif
 
 #ifdef HAVE_W32_SYSTEM
 #define sock_close(a)  closesocket(a)
 #else
 #define sock_close(a)  close(a)
 #endif
 
 #ifndef EAGAIN
 #define EAGAIN  EWOULDBLOCK
 #endif
 #ifndef INADDR_NONE  /* Slowaris is missing that.  */
 #define INADDR_NONE  ((unsigned long)(-1))
 #endif /*INADDR_NONE*/
 
 #define HTTP_PROXY_ENV           "http_proxy"
 #define MAX_LINELEN 20000  /* Max. length of a HTTP header line. */
 #define VALID_URI_CHARS "abcdefghijklmnopqrstuvwxyz"   \
                         "ABCDEFGHIJKLMNOPQRSTUVWXYZ"   \
                         "01234567890@"                 \
                         "!\"#$%&'()*+,-./:;<=>?[\\]^_{|}~"
 
 #if HTTP_USE_NTBTLS
 typedef ntbtls_t         tls_session_t;
 # define USE_TLS 1
 #elif HTTP_USE_GNUTLS
 typedef gnutls_session_t tls_session_t;
 # define USE_TLS 1
 #else
 typedef void *tls_session_t;
 # undef USE_TLS
 #endif
 
 static gpg_err_code_t do_parse_uri (parsed_uri_t uri, int only_local_part,
                                     int no_scheme_check, int force_tls);
 static gpg_error_t parse_uri (parsed_uri_t *ret_uri, const char *uri,
                               int no_scheme_check, int force_tls);
 static int remove_escapes (char *string);
 static int insert_escapes (char *buffer, const char *string,
                            const char *special);
 static uri_tuple_t parse_tuple (char *string);
 static gpg_error_t send_request (http_t hd, const char *httphost,
                                  const char *auth,const char *proxy,
 				 const char *srvtag, unsigned int timeout,
                                  strlist_t headers);
 static char *build_rel_path (parsed_uri_t uri);
 static gpg_error_t parse_response (http_t hd);
 
 static gpg_error_t connect_server (const char *server, unsigned short port,
                                    unsigned int flags, const char *srvtag,
                                    unsigned int timeout, assuan_fd_t *r_sock);
 static gpgrt_ssize_t read_server (assuan_fd_t sock, void *buffer, size_t size);
 static gpg_error_t write_server (assuan_fd_t sock, const char *data, size_t length);
 
 static gpgrt_ssize_t cookie_read (void *cookie, void *buffer, size_t size);
 static gpgrt_ssize_t cookie_write (void *cookie,
                                    const void *buffer, size_t size);
 static int cookie_close (void *cookie);
 #if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static gpgrt_ssize_t simple_cookie_read (void *cookie,
                                          void *buffer, size_t size);
 static gpgrt_ssize_t simple_cookie_write (void *cookie,
                                           const void *buffer, size_t size);
 #endif
 
 /* A socket object used to a allow ref counting of sockets.  */
 struct my_socket_s
 {
   assuan_fd_t fd; /* The actual socket - shall never be ASSUAN_INVALID_FD.  */
   int refcount;   /* Number of references to this socket.  */
 };
 typedef struct my_socket_s *my_socket_t;
 
 
 /* Cookie function structure and cookie object.  */
 static es_cookie_io_functions_t cookie_functions =
   {
     cookie_read,
     cookie_write,
     NULL,
     cookie_close
   };
 
 
 struct cookie_s
 {
   /* Socket object or NULL if already closed. */
   my_socket_t sock;
 
   /* The session object or NULL if not used. */
   http_session_t session;
 
   /* True if TLS is to be used.  */
   int use_tls;
 
   /* The remaining content length and a flag telling whether to use
      the content length.  */
   uint64_t content_length;
   unsigned int content_length_valid:1;
 };
 typedef struct cookie_s *cookie_t;
 
 
 /* Simple cookie functions.  Here the cookie is an int with the
  * socket. */
 #if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static es_cookie_io_functions_t simple_cookie_functions =
   {
     simple_cookie_read,
     simple_cookie_write,
     NULL,
     NULL
   };
 #endif
 
 /* An object to store information about a proxy.  */
 struct proxy_info_s
 {
   parsed_uri_t uri;   /* The parsed proxy URL.   */
   int is_http_proxy;  /* This is an http proxy.  */
 };
 typedef struct proxy_info_s *proxy_info_t;
 
 
 #if SIZEOF_UNSIGNED_LONG == 8
 # define HTTP_SESSION_MAGIC 0x0068545470534553 /* "hTTpSES" */
 #else
 # define HTTP_SESSION_MAGIC 0x68547365         /* "hTse"    */
 #endif
 
 /* The session object. */
 struct http_session_s
 {
   unsigned long magic;
 
   int refcount;    /* Number of references to this object.  */
 #ifdef HTTP_USE_GNUTLS
   gnutls_certificate_credentials_t certcred;
 #endif /*HTTP_USE_GNUTLS*/
 #ifdef USE_TLS
   tls_session_t tls_session;
   struct {
     int done;      /* Verifciation has been done.  */
     int rc;        /* TLS verification return code.  */
     unsigned int status; /* Verification status.  */
   } verify;
   char *servername; /* Malloced server name.  */
 #endif /*USE_TLS*/
   /* A callback function to log details of TLS certifciates.  */
   void (*cert_log_cb) (http_session_t, gpg_error_t, const char *,
                        const void **, size_t *);
 
   /* The flags passed to the session object.  */
   unsigned int flags;
 
   /* A per-session TLS verification callback.  */
   http_verify_cb_t verify_cb;
   void *verify_cb_value;
 
   /* The connect timeout */
   unsigned int connect_timeout;
 };
 
 
 /* An object to save header lines. */
 struct header_s
 {
   struct header_s *next;
   char *value;    /* The value of the header (malloced).  */
   char name[1];   /* The name of the header (canonicalized). */
 };
 typedef struct header_s *header_t;
 
 
 #if SIZEOF_UNSIGNED_LONG == 8
 # define HTTP_CONTEXT_MAGIC 0x0068545470435458 /* "hTTpCTX" */
 #else
 # define HTTP_CONTEXT_MAGIC 0x68546378         /* "hTcx"    */
 #endif
 
 
 /* Our handle context. */
 struct http_context_s
 {
   unsigned long magic;
   unsigned int status_code;
   my_socket_t sock;
   unsigned int in_data:1;
   unsigned int is_http_0_9:1;
   estream_t fp_read;
   estream_t fp_write;
   void *write_cookie;
   void *read_cookie;
   http_session_t session;
   parsed_uri_t uri;
   http_req_t req_type;
   char *buffer;          /* Line buffer. */
   size_t buffer_size;
   unsigned int flags;
   header_t headers;      /* Received headers. */
 };
 
 
 /* Two flags to enable verbose and debug mode.  Although currently not
  * set-able a value > 1 for OPT_DEBUG enables debugging of the session
  * reference counting.  */
 static int opt_verbose;
 static int opt_debug;
 
 /* The global callback for the verification function for GNUTLS.  */
 static gpg_error_t (*tls_callback) (http_t, http_session_t, int);
 
 /* The list of files with trusted CA certificates for GNUTLS.  */
 static strlist_t tls_ca_certlist;
 
 /* The list of files with extra trusted CA certificates for GNUTLS.  */
 static strlist_t cfg_ca_certlist;
 
 /* The global callback for net activity.  */
 static void (*netactivity_cb)(void);
 
 
 
 #if defined(HAVE_W32_SYSTEM) && !defined(HTTP_NO_WSASTARTUP)
 
 #if GNUPG_MAJOR_VERSION == 1
 #define REQ_WINSOCK_MAJOR  1
 #define REQ_WINSOCK_MINOR  1
 #else
 #define REQ_WINSOCK_MAJOR  2
 #define REQ_WINSOCK_MINOR  2
 #endif
 
 
 static void
 deinit_sockets (void)
 {
   WSACleanup();
 }
 
 static void
 init_sockets (void)
 {
   static int initialized;
   static WSADATA wsdata;
 
   if (initialized)
     return;
 
   if ( WSAStartup( MAKEWORD (REQ_WINSOCK_MINOR, REQ_WINSOCK_MAJOR), &wsdata ) )
     {
       log_error ("error initializing socket library: ec=%d\n",
                  (int)WSAGetLastError () );
       return;
     }
   if ( LOBYTE(wsdata.wVersion) != REQ_WINSOCK_MAJOR
        || HIBYTE(wsdata.wVersion) != REQ_WINSOCK_MINOR )
     {
       log_error ("socket library version is %x.%x - but %d.%d needed\n",
                  LOBYTE(wsdata.wVersion), HIBYTE(wsdata.wVersion),
                  REQ_WINSOCK_MAJOR, REQ_WINSOCK_MINOR);
       WSACleanup();
       return;
     }
   atexit ( deinit_sockets );
   initialized = 1;
 }
 #endif /*HAVE_W32_SYSTEM && !HTTP_NO_WSASTARTUP*/
 
 
 /* Create a new socket object.  Returns NULL and closes FD if not
    enough memory is available.  */
 static my_socket_t
 _my_socket_new (int lnr, assuan_fd_t fd)
 {
   my_socket_t so;
 
   so = xtrymalloc (sizeof *so);
   if (!so)
     {
       int save_errno = errno;
       assuan_sock_close (fd);
       gpg_err_set_errno (save_errno);
       return NULL;
     }
   so->fd = fd;
   so->refcount = 1;
   if (opt_debug)
     log_debug ("http.c:%d:socket_new: object %p for fd %d created\n",
                lnr, so, (int)so->fd);
   return so;
 }
 #define my_socket_new(a) _my_socket_new (__LINE__, (a))
 
 /* Bump up the reference counter for the socket object SO.  */
 static my_socket_t
 _my_socket_ref (int lnr, my_socket_t so)
 {
   so->refcount++;
   if (opt_debug > 1)
     log_debug ("http.c:%d:socket_ref: object %p for fd %d refcount now %d\n",
                lnr, so, (int)so->fd, so->refcount);
   return so;
 }
 #define my_socket_ref(a) _my_socket_ref (__LINE__,(a))
 
 
 /* Bump down the reference counter for the socket object SO.  If SO
    has no more references, close the socket and release the
    object.  */
 static void
 _my_socket_unref (int lnr, my_socket_t so,
                   void (*preclose)(void*), void *preclosearg)
 {
   if (so)
     {
       so->refcount--;
       if (opt_debug > 1)
         log_debug ("http.c:%d:socket_unref: object %p for fd %d ref now %d\n",
                    lnr, so, (int)so->fd, so->refcount);
 
       if (!so->refcount)
         {
           if (preclose)
             preclose (preclosearg);
           assuan_sock_close (so->fd);
           xfree (so);
         }
     }
 }
 #define my_socket_unref(a,b,c) _my_socket_unref (__LINE__,(a),(b),(c))
 
 
 #ifdef HTTP_USE_GNUTLS
 static ssize_t
 my_gnutls_read (gnutls_transport_ptr_t ptr, void *buffer, size_t size)
 {
   my_socket_t sock = ptr;
 #if USE_NPTH
   return npth_read (sock->fd, buffer, size);
 #else
   return read (sock->fd, buffer, size);
 #endif
 }
 static ssize_t
 my_gnutls_write (gnutls_transport_ptr_t ptr, const void *buffer, size_t size)
 {
   my_socket_t sock = ptr;
 #if USE_NPTH
   return npth_write (sock->fd, buffer, size);
 #else
   return write (sock->fd, buffer, size);
 #endif
 }
 #endif /*HTTP_USE_GNUTLS*/
 
 
 #ifdef HTTP_USE_NTBTLS
 /* Connect the ntbls callback to our generic callback.  */
 static gpg_error_t
 my_ntbtls_verify_cb (void *opaque, ntbtls_t tls, unsigned int verify_flags)
 {
   http_t hd = opaque;
 
   (void)verify_flags;
 
   log_assert (hd && hd->session && hd->session->verify_cb);
   log_assert (hd->magic == HTTP_CONTEXT_MAGIC);
   log_assert (hd->session->magic == HTTP_SESSION_MAGIC);
 
   return hd->session->verify_cb (hd->session->verify_cb_value,
                                  hd, hd->session,
                                  (hd->flags | hd->session->flags),
                                  tls);
 }
 #endif /*HTTP_USE_NTBTLS*/
 
 
 
 
 /* This notification function is called by estream whenever stream is
    closed.  Its purpose is to mark the closing in the handle so
    that a http_close won't accidentally close the estream.  The function
    http_close removes this notification so that it won't be called if
    http_close was used before an es_fclose.  */
 static void
 fp_onclose_notification (estream_t stream, void *opaque)
 {
   http_t hd = opaque;
 
   log_assert (hd->magic == HTTP_CONTEXT_MAGIC);
   if (hd->fp_read && hd->fp_read == stream)
     hd->fp_read = NULL;
   else if (hd->fp_write && hd->fp_write == stream)
     hd->fp_write = NULL;
 }
 
 
 /*
  * Helper function to create an HTTP header with hex encoded data.  A
  * new buffer is returned.  This buffer is the concatenation of the
  * string PREFIX, the hex-encoded DATA of length LEN and the string
  * SUFFIX.  On error NULL is returned and ERRNO set.
  */
 static char *
 make_header_line (const char *prefix, const char *suffix,
                   const void *data, size_t len )
 {
   static unsigned char bintoasc[] =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz"
     "0123456789+/";
   const unsigned char *s = data;
   char *buffer, *p;
 
   buffer = xtrymalloc (strlen (prefix) + (len+2)/3*4 + strlen (suffix) + 1);
   if (!buffer)
     return NULL;
   p = stpcpy (buffer, prefix);
   for ( ; len >= 3 ; len -= 3, s += 3 )
     {
       *p++ = bintoasc[(s[0] >> 2) & 077];
       *p++ = bintoasc[(((s[0] <<4)&060)|((s[1] >> 4)&017))&077];
       *p++ = bintoasc[(((s[1]<<2)&074)|((s[2]>>6)&03))&077];
       *p++ = bintoasc[s[2]&077];
       *p = 0;
     }
   if ( len == 2 )
     {
       *p++ = bintoasc[(s[0] >> 2) & 077];
       *p++ = bintoasc[(((s[0] <<4)&060)|((s[1] >> 4)&017))&077];
       *p++ = bintoasc[((s[1]<<2)&074)];
       *p++ = '=';
     }
   else if ( len == 1 )
     {
       *p++ = bintoasc[(s[0] >> 2) & 077];
       *p++ = bintoasc[(s[0] <<4)&060];
       *p++ = '=';
       *p++ = '=';
     }
   *p = 0;
   strcpy (p, suffix);
   return buffer;
 }
 
 
 
 
 /* Set verbosity and debug mode for this module. */
 void
 http_set_verbose (int verbose, int debug)
 {
   opt_verbose = verbose;
   opt_debug = debug;
 }
 
 
 /* Register a non-standard global TLS callback function.  If no
    verification is desired a callback needs to be registered which
    always returns NULL.  Only used for GNUTLS. */
 void
 http_register_tls_callback (gpg_error_t (*cb)(http_t, http_session_t, int))
 {
   tls_callback = cb;
 }
 
 
 /* Register a CA certificate for future use.  The certificate is
    expected to be in FNAME.  PEM format is assume if FNAME has a
    suffix of ".pem".  If FNAME is NULL the list of CA files is
    removed.  Only used for GNUTLS. */
 void
 http_register_tls_ca (const char *fname)
 {
   gpg_err_code_t ec;
   strlist_t sl;
 
   if (!fname)
     {
       free_strlist (tls_ca_certlist);
       tls_ca_certlist = NULL;
     }
   else
     {
       /* Warn if we can't access right now, but register it anyway in
          case it becomes accessible later */
       if ((ec = gnupg_access (fname, F_OK)))
         log_info (_("can't access '%s': %s\n"), fname, gpg_strerror (ec));
       sl = add_to_strlist (&tls_ca_certlist, fname);
       if (*sl->d && !strcmp (sl->d + strlen (sl->d) - 4, ".pem"))
         sl->flags = 1;
     }
 }
 
 
 /* Register a CA certificate for future use.  The certificate is
  * expected to be in FNAME.  PEM format is assume if FNAME has a
  * suffix of ".pem".  If FNAME is NULL the list of CA files is
  * removed.  This is a variant of http_register_tls_ca which puts the
  * certificate into a separate list enabled using HTTP_FLAG_TRUST_CFG.
  * Only used for GNUTLS.  */
 void
 http_register_cfg_ca (const char *fname)
 {
   gpg_err_code_t ec;
   strlist_t sl;
 
   if (!fname)
     {
       free_strlist (cfg_ca_certlist);
       cfg_ca_certlist = NULL;
     }
   else
     {
       /* Warn if we can't access right now, but register it anyway in
          case it becomes accessible later */
       if ((ec = gnupg_access (fname, F_OK)))
         log_info (_("can't access '%s': %s\n"), fname, gpg_strerror (ec));
       sl = add_to_strlist (&cfg_ca_certlist, fname);
       if (*sl->d && !strcmp (sl->d + strlen (sl->d) - 4, ".pem"))
         sl->flags = 1;
     }
 }
 
 
 /* Register a callback which is called every time the HTTP mode has
  * made a successful connection to some server.  */
 void
 http_register_netactivity_cb (void (*cb)(void))
 {
   netactivity_cb = cb;
 }
 
 
 /* Call the netactivity callback if any.  */
 static void
 notify_netactivity (void)
 {
   if (netactivity_cb)
     netactivity_cb ();
 }
 
 
 
 #ifdef USE_TLS
 /* Free the TLS session associated with SESS, if any.  */
 static void
 close_tls_session (http_session_t sess)
 {
   if (sess->tls_session)
     {
 # if HTTP_USE_NTBTLS
       /* FIXME!!
          Possibly, ntbtls_get_transport and close those streams.
          Somehow get SOCK to call my_socket_unref.
       */
       ntbtls_release (sess->tls_session);
 # elif HTTP_USE_GNUTLS
       my_socket_t sock = gnutls_transport_get_ptr (sess->tls_session);
       my_socket_unref (sock, NULL, NULL);
       gnutls_deinit (sess->tls_session);
       if (sess->certcred)
         gnutls_certificate_free_credentials (sess->certcred);
 # endif /*HTTP_USE_GNUTLS*/
       xfree (sess->servername);
       sess->tls_session = NULL;
     }
 }
 #endif /*USE_TLS*/
 
 
 /* Release a session.  Take care not to release it while it is being
    used by a http context object.  */
 static void
 session_unref (int lnr, http_session_t sess)
 {
   if (!sess)
     return;
 
   log_assert (sess->magic == HTTP_SESSION_MAGIC);
 
   sess->refcount--;
   if (opt_debug > 1)
     log_debug ("http.c:%d:session_unref: sess %p ref now %d\n",
                lnr, sess, sess->refcount);
   if (sess->refcount)
     return;
 
 #ifdef USE_TLS
   close_tls_session (sess);
 #endif /*USE_TLS*/
 
   sess->magic = 0xdeadbeef;
   xfree (sess);
 }
 #define http_session_unref(a) session_unref (__LINE__, (a))
 
 void
 http_session_release (http_session_t sess)
 {
   http_session_unref (sess);
 }
 
 
 /* Create a write stream and store it in the fp_write member.  Also
  * store the tls flag and the session.  */
 static gpg_error_t
 make_fp_write (http_t hd, int use_tls, http_session_t session)
 {
   cookie_t cookie;
 
   cookie = xtrycalloc (1, sizeof *cookie);
   if (!cookie)
     return gpg_error_from_syserror ();
   cookie->sock = my_socket_ref (hd->sock);
   cookie->use_tls = use_tls;
   if (session)
     cookie->session = http_session_ref (session);
   hd->fp_write = es_fopencookie (cookie, "w", cookie_functions);
   if (!hd->fp_write)
     {
       gpg_error_t err = gpg_error_from_syserror ();
       my_socket_unref (cookie->sock, NULL, NULL);
       if (session)
         http_session_unref (cookie->session);
       xfree (cookie);
       return err;
     }
   hd->write_cookie = cookie;  /* Cookie now owned by FP_WRITE.  */
   return 0;
 }
 
 
 /* Create a read stream and store it in the fp_read member.  Also
  * store the tls flag and the session.  */
 static gpg_error_t
 make_fp_read (http_t hd, int use_tls, http_session_t session)
 {
   cookie_t cookie;
 
   cookie = xtrycalloc (1, sizeof *cookie);
   if (!cookie)
     return gpg_error_from_syserror ();
   cookie->sock = my_socket_ref (hd->sock);
   cookie->use_tls = use_tls;
   if (session)
     cookie->session = http_session_ref (session);
   hd->fp_read = es_fopencookie (cookie, "r", cookie_functions);
   if (!hd->fp_read)
     {
       gpg_error_t err = gpg_error_from_syserror ();
       my_socket_unref (cookie->sock, NULL, NULL);
       if (session)
         http_session_unref (cookie->session);
       xfree (cookie);
       return err;
     }
   hd->read_cookie = cookie;  /* Cookie now owned by FP_READ.  */
   return 0;
 }
 
 
 /* Create a new session object which is currently used to enable TLS
  * support.  It may eventually allow reusing existing connections.
  * Valid values for FLAGS are:
  *   HTTP_FLAG_TRUST_DEF - Use the CAs set with http_register_tls_ca
  *   HTTP_FLAG_TRUST_SYS - Also use the CAs defined by the system
  *   HTTP_FLAG_TRUST_CFG - Also use CAs set with http_register_cfg_ca
  *   HTTP_FLAG_NO_CRL    - Do not consult CRLs for https.
  */
 gpg_error_t
 http_session_new (http_session_t *r_session,
                   const char *intended_hostname, unsigned int flags,
                   http_verify_cb_t verify_cb, void *verify_cb_value)
 {
   gpg_error_t err;
   http_session_t sess;
 
   *r_session = NULL;
 
   sess = xtrycalloc (1, sizeof *sess);
   if (!sess)
     return gpg_error_from_syserror ();
   sess->magic = HTTP_SESSION_MAGIC;
   sess->refcount = 1;
   sess->flags = flags;
   sess->verify_cb = verify_cb;
   sess->verify_cb_value = verify_cb_value;
   sess->connect_timeout = 0;
 
 #if HTTP_USE_NTBTLS
   {
     (void)intended_hostname; /* Not needed because we do not preload
                               * certificates.  */
 
     err = ntbtls_new (&sess->tls_session, NTBTLS_CLIENT);
     if (err)
       {
         log_error ("ntbtls_new failed: %s\n", gpg_strerror (err));
         goto leave;
       }
 
   }
 #elif HTTP_USE_GNUTLS
   {
     const char *errpos;
     int rc;
     strlist_t sl;
     int add_system_cas = !!(flags & HTTP_FLAG_TRUST_SYS);
     int is_hkps_pool;
 
     (void)intended_hostname;
 
     rc = gnutls_certificate_allocate_credentials (&sess->certcred);
     if (rc < 0)
       {
         log_error ("gnutls_certificate_allocate_credentials failed: %s\n",
                    gnutls_strerror (rc));
         err = gpg_error (GPG_ERR_GENERAL);
         goto leave;
       }
 
     /* Disabled for 2.2.19 to due problems with the standard hkps pool.  */
     /* is_hkps_pool = (intended_hostname */
     /*                 && !ascii_strcasecmp (intended_hostname, */
     /*                                       get_default_keyserver (1))); */
     is_hkps_pool = 0;
 
     /* If we are looking for the hkps pool from sks-keyservers.net,
      * then forcefully use its dedicated certificate authority.  */
     /* Disabled for 2.2.29 because the service had to be shutdown.  */
     /* if (is_hkps_pool) */
     /*   { */
     /*     char *pemname = make_filename_try (gnupg_datadir (), */
     /*                                        "sks-keyservers.netCA.pem", NULL); */
     /*     if (!pemname) */
     /*       { */
     /*         err = gpg_error_from_syserror (); */
     /*         log_error ("setting CA from file '%s' failed: %s\n", */
     /*                    pemname, gpg_strerror (err)); */
     /*       } */
     /*     else */
     /*       { */
     /*         rc = gnutls_certificate_set_x509_trust_file */
     /*           (sess->certcred, pemname, GNUTLS_X509_FMT_PEM); */
     /*         if (rc < 0) */
     /*           log_info ("setting CA from file '%s' failed: %s\n", */
     /*                     pemname, gnutls_strerror (rc)); */
     /*         xfree (pemname); */
     /*       } */
     /*         */
     /*     if (is_hkps_pool) */
     /*       add_system_cas = 0; */
     /*   } */
 
     /* Add configured certificates to the session.  */
     if ((flags & HTTP_FLAG_TRUST_DEF) && !is_hkps_pool)
       {
         for (sl = tls_ca_certlist; sl; sl = sl->next)
           {
             rc = gnutls_certificate_set_x509_trust_file
               (sess->certcred, sl->d,
                (sl->flags & 1)? GNUTLS_X509_FMT_PEM : GNUTLS_X509_FMT_DER);
             if (rc < 0)
               log_info ("setting CA from file '%s' failed: %s\n",
                         sl->d, gnutls_strerror (rc));
           }
 
         /* If HKP trust is requested and there are no HKP certificates
          * configured, also try the standard system certificates.  */
         if (!tls_ca_certlist)
           add_system_cas = 1;
       }
 
     /* Add system certificates to the session.  */
     if (add_system_cas)
       {
 #if GNUTLS_VERSION_NUMBER >= 0x030014
         static int shown;
 
         rc = gnutls_certificate_set_x509_system_trust (sess->certcred);
         if (rc < 0)
           log_info ("setting system CAs failed: %s\n", gnutls_strerror (rc));
         else if (!shown)
           {
             shown = 1;
             log_info ("number of system provided CAs: %d\n", rc);
           }
 #endif /* gnutls >= 3.0.20 */
       }
 
     /* Add other configured certificates to the session.  */
     if ((flags & HTTP_FLAG_TRUST_CFG) && !is_hkps_pool)
       {
         for (sl = cfg_ca_certlist; sl; sl = sl->next)
           {
             rc = gnutls_certificate_set_x509_trust_file
               (sess->certcred, sl->d,
                (sl->flags & 1)? GNUTLS_X509_FMT_PEM : GNUTLS_X509_FMT_DER);
             if (rc < 0)
               log_info ("setting extra CA from file '%s' failed: %s\n",
                         sl->d, gnutls_strerror (rc));
           }
       }
 
 
     rc = gnutls_init (&sess->tls_session, GNUTLS_CLIENT);
     if (rc < 0)
       {
         log_error ("gnutls_init failed: %s\n", gnutls_strerror (rc));
         err = gpg_error (GPG_ERR_GENERAL);
         goto leave;
       }
     /* A new session has the transport ptr set to (void*(-1), we need
        it to be NULL.  */
     gnutls_transport_set_ptr (sess->tls_session, NULL);
 
     rc = gnutls_priority_set_direct (sess->tls_session,
                                      "NORMAL",
                                      &errpos);
     if (rc < 0)
       {
         log_error ("gnutls_priority_set_direct failed at '%s': %s\n",
                    errpos, gnutls_strerror (rc));
         err = gpg_error (GPG_ERR_GENERAL);
         goto leave;
       }
 
     rc = gnutls_credentials_set (sess->tls_session,
                                  GNUTLS_CRD_CERTIFICATE, sess->certcred);
     if (rc < 0)
       {
         log_error ("gnutls_credentials_set failed: %s\n", gnutls_strerror (rc));
         err = gpg_error (GPG_ERR_GENERAL);
         goto leave;
       }
   }
 #else /*!HTTP_USE_GNUTLS && !HTTP_USE_NTBTLS*/
   {
     (void)intended_hostname;
     (void)flags;
   }
 #endif /*!HTTP_USE_GNUTLS && !HTTP_USE_NTBTLS*/
 
   if (opt_debug > 1)
     log_debug ("http.c:session_new: sess %p created\n", sess);
   err = 0;
 
 #if USE_TLS
  leave:
 #endif /*USE_TLS*/
   if (err)
     http_session_unref (sess);
   else
     *r_session = sess;
 
   return err;
 }
 
 
 /* Increment the reference count for session SESS.  Passing NULL for
    SESS is allowed. */
 http_session_t
 http_session_ref (http_session_t sess)
 {
   if (sess)
     {
       sess->refcount++;
       if (opt_debug > 1)
         log_debug ("http.c:session_ref: sess %p ref now %d\n",
                    sess, sess->refcount);
     }
   return sess;
 }
 
 
 void
 http_session_set_log_cb (http_session_t sess,
                          void (*cb)(http_session_t, gpg_error_t,
                                     const char *hostname,
                                     const void **certs, size_t *certlens))
 {
   sess->cert_log_cb = cb;
 }
 
 
 /* Set the TIMEOUT in milliseconds for the connection's connect
  * calls.  Using 0 disables the timeout.  */
 void
 http_session_set_timeout (http_session_t sess, unsigned int timeout)
 {
   sess->connect_timeout = timeout;
 }
 
 
 
 
 /* Start a HTTP retrieval and on success store at R_HD a context
    pointer for completing the request and to wait for the response.
    If HTTPHOST is not NULL it is used for the Host header instead of a
    Host header derived from the URL. */
 gpg_error_t
 http_open (http_t *r_hd, http_req_t reqtype, const char *url,
            const char *httphost,
            const char *auth, unsigned int flags, const char *proxy,
            http_session_t session, const char *srvtag, strlist_t headers)
 {
   gpg_error_t err;
   http_t hd;
 
   *r_hd = NULL;
 
   if (!(reqtype == HTTP_REQ_GET || reqtype == HTTP_REQ_POST))
     return gpg_err_make (default_errsource, GPG_ERR_INV_ARG);
 
   /* Create the handle. */
   hd = xtrycalloc (1, sizeof *hd);
   if (!hd)
     return gpg_error_from_syserror ();
   hd->magic = HTTP_CONTEXT_MAGIC;
   hd->req_type = reqtype;
   hd->flags = flags;
   hd->session = http_session_ref (session);
 
   err = parse_uri (&hd->uri, url, 0, !!(flags & HTTP_FLAG_FORCE_TLS));
   if (!err)
     err = send_request (hd, httphost, auth, proxy, srvtag,
                         hd->session? hd->session->connect_timeout : 0,
                         headers);
 
   if (err)
     {
       my_socket_unref (hd->sock, NULL, NULL);
       if (hd->fp_read)
         es_fclose (hd->fp_read);
       if (hd->fp_write)
         es_fclose (hd->fp_write);
       http_session_unref (hd->session);
       xfree (hd);
     }
   else
     *r_hd = hd;
   return err;
 }
 
 
 /* This function is useful to connect to a generic TCP service using
    this http abstraction layer.  This has the advantage of providing
    service tags and an estream interface.  TIMEOUT is in milliseconds. */
 gpg_error_t
 http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
                   unsigned int flags, const char *srvtag, unsigned int timeout)
 {
   gpg_error_t err = 0;
   http_t hd;
 
   *r_hd = NULL;
 
   if ((flags & HTTP_FLAG_FORCE_TOR))
     {
       int mode;
 
       if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
         {
           log_error ("Tor support is not available\n");
           return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
         }
       /* Non-blocking connects do not work with our Tor proxy because
        * we can't continue the Socks protocol after the EINPROGRESS.
        * Disable the timeout to use a blocking connect.  */
       timeout = 0;
     }
 
   /* Create the handle. */
   hd = xtrycalloc (1, sizeof *hd);
   if (!hd)
     return gpg_error_from_syserror ();
   hd->magic = HTTP_CONTEXT_MAGIC;
   hd->req_type = HTTP_REQ_OPAQUE;
   hd->flags = flags;
 
   /* Connect.  */
   {
     assuan_fd_t sock;
 
     err = connect_server (server, port, hd->flags, srvtag, timeout, &sock);
     if (err)
       {
         xfree (hd);
         return err;
       }
     hd->sock = my_socket_new (sock);
     if (!hd->sock)
       {
         err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
         xfree (hd);
         return err;
       }
   }
 
   /* Setup estreams for reading and writing.  */
   err = make_fp_write (hd, 0, NULL);
   if (err)
     goto leave;
 
   err = make_fp_read (hd, 0, NULL);
   if (err)
     goto leave;
 
   /* Register close notification to interlock the use of es_fclose in
      http_close and in user code.  */
   err = es_onclose (hd->fp_write, 1, fp_onclose_notification, hd);
   if (!err)
     err = es_onclose (hd->fp_read, 1, fp_onclose_notification, hd);
 
  leave:
   if (err)
     {
       if (hd->fp_read)
         es_fclose (hd->fp_read);
       if (hd->fp_write)
         es_fclose (hd->fp_write);
       my_socket_unref (hd->sock, NULL, NULL);
       xfree (hd);
     }
   else
     *r_hd = hd;
   return err;
 }
 
 
 
 
 void
 http_start_data (http_t hd)
 {
   if (!hd->in_data)
     {
       if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
         log_debug_with_string ("\r\n", "http.c:request-header:");
       es_fputs ("\r\n", hd->fp_write);
       es_fflush (hd->fp_write);
       hd->in_data = 1;
     }
   else
     es_fflush (hd->fp_write);
 }
 
 
 gpg_error_t
 http_wait_response (http_t hd)
 {
   gpg_error_t err;
   cookie_t cookie;
   int use_tls;
 
   /* Make sure that we are in the data. */
   http_start_data (hd);
 
   /* Close the write stream.  Note that the reference counted socket
      object keeps the actual system socket open.  */
   cookie = hd->write_cookie;
   if (!cookie)
     return gpg_err_make (default_errsource, GPG_ERR_INTERNAL);
 
   use_tls = cookie->use_tls;
   es_fclose (hd->fp_write);
   hd->fp_write = NULL;
   /* The close has released the cookie and thus we better set it to NULL.  */
   hd->write_cookie = NULL;
 
   /* Shutdown one end of the socket is desired.  As per HTTP/1.0 this
      is not required but some very old servers (e.g. the original pksd
      keyserver didn't worked without it.  */
   if ((hd->flags & HTTP_FLAG_SHUTDOWN))
     shutdown (FD2INT (hd->sock->fd), 1);
   hd->in_data = 0;
 
   /* Create a new cookie and a stream for reading.  */
   err = make_fp_read (hd, use_tls, hd->session);
   if (err)
     return err;
 
   err = parse_response (hd);
 
   if (!err)
     err = es_onclose (hd->fp_read, 1, fp_onclose_notification, hd);
 
   return err;
 }
 
 
 /* Convenience function to send a request and wait for the response.
    Closes the handle on error.  If PROXY is not NULL, this value will
    be used as an HTTP proxy and any enabled $http_proxy gets
    ignored. */
 gpg_error_t
 http_open_document (http_t *r_hd, const char *document,
                     const char *auth, unsigned int flags, const char *proxy,
                     http_session_t session,
                     const char *srvtag, strlist_t headers)
 {
   gpg_error_t err;
 
   err = http_open (r_hd, HTTP_REQ_GET, document, NULL, auth, flags,
                    proxy, session, srvtag, headers);
   if (err)
     return err;
 
   err = http_wait_response (*r_hd);
   if (err)
     http_close (*r_hd, 0);
 
   return err;
 }
 
 
 void
 http_close (http_t hd, int keep_read_stream)
 {
   if (!hd)
     return;
 
   log_assert (hd->magic == HTTP_CONTEXT_MAGIC);
 
   /* First remove the close notifications for the streams.  */
   if (hd->fp_read)
     es_onclose (hd->fp_read, 0, fp_onclose_notification, hd);
   if (hd->fp_write)
     es_onclose (hd->fp_write, 0, fp_onclose_notification, hd);
 
   /* Now we can close the streams.  */
   my_socket_unref (hd->sock, NULL, NULL);
   if (hd->fp_read && !keep_read_stream)
     es_fclose (hd->fp_read);
   if (hd->fp_write)
     es_fclose (hd->fp_write);
   http_session_unref (hd->session);
   hd->magic = 0xdeadbeef;
   http_release_parsed_uri (hd->uri);
   while (hd->headers)
     {
       header_t tmp = hd->headers->next;
       xfree (hd->headers->value);
       xfree (hd->headers);
       hd->headers = tmp;
     }
   xfree (hd->buffer);
   xfree (hd);
 }
 
 
 estream_t
 http_get_read_ptr (http_t hd)
 {
   return hd?hd->fp_read:NULL;
 }
 
 estream_t
 http_get_write_ptr (http_t hd)
 {
   return hd?hd->fp_write:NULL;
 }
 
 unsigned int
 http_get_status_code (http_t hd)
 {
   return hd?hd->status_code:0;
 }
 
 /* Return information pertaining to TLS.  If TLS is not in use for HD,
    NULL is returned.  WHAT is used ask for specific information:
 
      (NULL) := Only check whether TLS is in use.  Returns an
                unspecified string if TLS is in use.  That string may
                even be the empty string.
  */
 const char *
 http_get_tls_info (http_t hd, const char *what)
 {
   (void)what;
 
   if (!hd)
     return NULL;
 
   return hd->uri->use_tls? "":NULL;
 }
 
 
 
 static gpg_error_t
 parse_uri (parsed_uri_t *ret_uri, const char *uri,
            int no_scheme_check, int force_tls)
 {
   gpg_err_code_t ec;
 
   *ret_uri = xtrycalloc (1, sizeof **ret_uri + 2 * strlen (uri) + 1);
   if (!*ret_uri)
     return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
   strcpy ((*ret_uri)->buffer, uri);
   strcpy ((*ret_uri)->buffer + strlen (uri) + 1, uri);
   (*ret_uri)->original = (*ret_uri)->buffer + strlen (uri) + 1;
   ec = do_parse_uri (*ret_uri, 0, no_scheme_check, force_tls);
   if (ec)
     {
       http_release_parsed_uri (*ret_uri);
       *ret_uri = NULL;
     }
   return gpg_err_make (default_errsource, ec);
 }
 
 
 /*
  * Parse an URI and put the result into the newly allocated RET_URI.
  * On success the caller must use http_release_parsed_uri() to
  * releases the resources.  If the HTTP_PARSE_NO_SCHEME_CHECK flag is
  * set, the function tries to parse the URL in the same way it would
  * do for an HTTP style URI.   */
 gpg_error_t
 http_parse_uri (parsed_uri_t *ret_uri, const char *uri,
                 unsigned int flags)
 {
   return parse_uri (ret_uri, uri, !!(flags & HTTP_PARSE_NO_SCHEME_CHECK), 0);
 }
 
 
 void
 http_release_parsed_uri (parsed_uri_t uri)
 {
   if (uri)
     {
       uri_tuple_t r, r2;
 
       for (r = uri->params; r; r = r2)
 	{
 	  r2 = r->next;
 	  xfree (r);
 	}
       for (r = uri->query; r; r = r2)
 	{
 	  r2 = r->next;
 	  xfree (r);
 	}
       xfree (uri);
     }
 }
 
 
 static gpg_err_code_t
 do_parse_uri (parsed_uri_t uri, int only_local_part,
               int no_scheme_check, int force_tls)
 {
   uri_tuple_t *tail;
   char *p, *p2, *p3, *pp;
   int n;
 
   p = uri->buffer;
   n = strlen (uri->buffer);
 
   /* Initialize all fields to an empty string or an empty list. */
   uri->scheme = uri->host = uri->path = p + n;
   uri->port = 0;
   uri->params = uri->query = NULL;
   uri->use_tls = 0;
   uri->is_http = 0;
   uri->opaque = 0;
   uri->v6lit = 0;
   uri->onion = 0;
   uri->explicit_port = 0;
   uri->off_host = 0;
   uri->off_path = 0;
 
   /* A quick validity check unless we have the opaque scheme. */
   if (strspn (p, VALID_URI_CHARS) != n
       && strncmp (p, "opaque:", 7))
     return GPG_ERR_BAD_URI;	/* Invalid characters found. */
 
   if (!only_local_part)
     {
       /* Find the scheme. */
       if (!(p2 = strchr (p, ':')) || p2 == p)
 	return GPG_ERR_BAD_URI; /* No scheme. */
       *p2++ = 0;
       for (pp=p; *pp; pp++)
        *pp = tolower (*(unsigned char*)pp);
       uri->scheme = p;
       if (!strcmp (uri->scheme, "http") && !force_tls)
         {
           uri->port = 80;
           uri->is_http = 1;
         }
       else if (!strcmp (uri->scheme, "hkp") && !force_tls)
         {
           uri->port = 11371;
           uri->is_http = 1;
         }
 #ifdef USE_TLS
       else if (!strcmp (uri->scheme, "https") || !strcmp (uri->scheme,"hkps")
                || (force_tls && (!strcmp (uri->scheme, "http")
                                  || !strcmp (uri->scheme,"hkp"))))
         {
           uri->port = 443;
           uri->is_http = 1;
           uri->use_tls = 1;
         }
 #endif /*USE_TLS*/
       else if (!strcmp (uri->scheme, "opaque"))
         {
           uri->opaque = 1;
           uri->path = p2;
           return 0;
         }
       else if (!no_scheme_check)
 	return GPG_ERR_INV_URI; /* Unsupported scheme */
 
       p = p2;
 
       if (*p == '/' && p[1] == '/' ) /* There seems to be a hostname. */
 	{
           p += 2;
 	  if ((p2 = strchr (p, '/')))
             {
               if (p2 - uri->buffer > 10000)
                 return GPG_ERR_BAD_URI;
               uri->off_path = p2 - uri->buffer;
               *p2++ = 0;
             }
           else
             {
               n = (p - uri->buffer) + strlen (p);
               if (n > 10000)
                 return GPG_ERR_BAD_URI;
               uri->off_path = n;
             }
 
           /* Check for username/password encoding */
           if ((p3 = strchr (p, '@')))
             {
               uri->auth = p;
               *p3++ = '\0';
               p = p3;
             }
 
           for (pp=p; *pp; pp++)
             *pp = tolower (*(unsigned char*)pp);
 
 	  /* Handle an IPv6 literal */
 	  if( *p == '[' && (p3=strchr( p, ']' )) )
 	    {
 	      *p3++ = '\0';
 	      /* worst case, uri->host should have length 0, points to \0 */
 	      uri->host = p + 1;
               if (p - uri->buffer > 10000)
                 return GPG_ERR_BAD_URI;
               uri->off_host = (p + 1) - uri->buffer;
               uri->v6lit = 1;
 	      p = p3;
 	    }
 	  else
             {
               uri->host = p;
               if (p - uri->buffer > 10000)
                 return GPG_ERR_BAD_URI;
               uri->off_host = p - uri->buffer;
             }
 
 	  if ((p3 = strchr (p, ':')))
 	    {
 	      *p3++ = '\0';
 	      uri->port = atoi (p3);
               uri->explicit_port = 1;
 	    }
 
 	  if ((n = remove_escapes (uri->host)) < 0)
 	    return GPG_ERR_BAD_URI;
 	  if (n != strlen (uri->host))
 	    return GPG_ERR_BAD_URI;	/* Hostname includes a Nul. */
 	  p = p2 ? p2 : NULL;
 	}
       else if (uri->is_http)
 	return GPG_ERR_INV_URI; /* No Leading double slash for HTTP.  */
       else
         {
           uri->opaque = 1;
           uri->path = p;
           if (is_onion_address (uri->path))
             uri->onion = 1;
           return 0;
         }
 
     } /* End global URI part. */
 
   /* Parse the pathname part if any.  */
   if (p && *p)
     {
       /* TODO: Here we have to check params. */
 
       /* Do we have a query part? */
       if ((p2 = strchr (p, '?')))
         *p2++ = 0;
 
       uri->path = p;
       if ((n = remove_escapes (p)) < 0)
         return GPG_ERR_BAD_URI;
       if (n != strlen (p))
         return GPG_ERR_BAD_URI;	/* Path includes a Nul. */
       p = p2 ? p2 : NULL;
 
       /* Parse a query string if any.  */
       if (p && *p)
         {
           tail = &uri->query;
           for (;;)
             {
               uri_tuple_t elem;
 
               if ((p2 = strchr (p, '&')))
                 *p2++ = 0;
               if (!(elem = parse_tuple (p)))
                 return GPG_ERR_BAD_URI;
               *tail = elem;
               tail = &elem->next;
 
               if (!p2)
                 break; /* Ready. */
               p = p2;
             }
         }
     }
 
   if (is_onion_address (uri->host))
     uri->onion = 1;
 
   return 0;
 }
 
 
 /*
  * Remove all %xx escapes; this is done in-place.  Returns: New length
  * of the string.
  */
 static int
 remove_escapes (char *string)
 {
   int n = 0;
   unsigned char *p, *s;
 
   for (p = s = (unsigned char*)string; *s; s++)
     {
       if (*s == '%')
 	{
 	  if (s[1] && s[2] && isxdigit (s[1]) && isxdigit (s[2]))
 	    {
 	      s++;
 	      *p = *s >= '0' && *s <= '9' ? *s - '0' :
 		*s >= 'A' && *s <= 'F' ? *s - 'A' + 10 : *s - 'a' + 10;
 	      *p <<= 4;
 	      s++;
 	      *p |= *s >= '0' && *s <= '9' ? *s - '0' :
 		*s >= 'A' && *s <= 'F' ? *s - 'A' + 10 : *s - 'a' + 10;
 	      p++;
 	      n++;
 	    }
 	  else
 	    {
 	      *p++ = *s++;
 	      if (*s)
 		*p++ = *s++;
 	      if (*s)
 		*p++ = *s++;
 	      if (*s)
 		*p = 0;
 	      return -1; /* Bad URI. */
 	    }
 	}
       else
 	{
 	  *p++ = *s;
 	  n++;
 	}
     }
   *p = 0; /* Make sure to keep a string terminator. */
   return n;
 }
 
 
 /* If SPECIAL is NULL this function escapes in forms mode.  */
 static size_t
 escape_data (char *buffer, const void *data, size_t datalen,
              const char *special)
 {
   int forms = !special;
   const unsigned char *s;
   size_t n = 0;
 
   if (forms)
     special = "%;?&=";
 
   for (s = data; datalen; s++, datalen--)
     {
       if (forms && *s == ' ')
         {
 	  if (buffer)
 	    *buffer++ = '+';
 	  n++;
         }
       else if (forms && *s == '\n')
         {
 	  if (buffer)
 	    memcpy (buffer, "%0D%0A", 6);
 	  n += 6;
         }
       else if (forms && *s == '\r' && datalen > 1 && s[1] == '\n')
         {
 	  if (buffer)
 	    memcpy (buffer, "%0D%0A", 6);
 	  n += 6;
           s++;
           datalen--;
         }
       else if (strchr (VALID_URI_CHARS, *s) && !strchr (special, *s))
 	{
 	  if (buffer)
 	    *(unsigned char*)buffer++ = *s;
 	  n++;
 	}
       else
 	{
 	  if (buffer)
 	    {
 	      snprintf (buffer, 4, "%%%02X", *s);
 	      buffer += 3;
 	    }
 	  n += 3;
 	}
     }
   return n;
 }
 
 
 static int
 insert_escapes (char *buffer, const char *string,
 		const char *special)
 {
   return escape_data (buffer, string, strlen (string), special);
 }
 
 
 /* Allocate a new string from STRING using standard HTTP escaping as
    well as escaping of characters given in SPECIALS.  A common pattern
    for SPECIALS is "%;?&=". However it depends on the needs, for
    example "+" and "/: often needs to be escaped too.  Returns NULL on
    failure and sets ERRNO.  If SPECIAL is NULL a dedicated forms
    encoding mode is used. */
 char *
 http_escape_string (const char *string, const char *specials)
 {
   int n;
   char *buf;
 
   n = insert_escapes (NULL, string, specials);
   buf = xtrymalloc (n+1);
   if (buf)
     {
       insert_escapes (buf, string, specials);
       buf[n] = 0;
     }
   return buf;
 }
 
 /* Allocate a new string from {DATA,DATALEN} using standard HTTP
    escaping as well as escaping of characters given in SPECIALS.  A
    common pattern for SPECIALS is "%;?&=".  However it depends on the
    needs, for example "+" and "/: often needs to be escaped too.
    Returns NULL on failure and sets ERRNO.  If SPECIAL is NULL a
    dedicated forms encoding mode is used. */
 char *
 http_escape_data (const void *data, size_t datalen, const char *specials)
 {
   int n;
   char *buf;
 
   n = escape_data (NULL, data, datalen, specials);
   buf = xtrymalloc (n+1);
   if (buf)
     {
       escape_data (buf, data, datalen, specials);
       buf[n] = 0;
     }
   return buf;
 }
 
 
 static uri_tuple_t
 parse_tuple (char *string)
 {
   char *p = string;
   char *p2;
   int n;
   uri_tuple_t tuple;
 
   if ((p2 = strchr (p, '=')))
     *p2++ = 0;
   if ((n = remove_escapes (p)) < 0)
     return NULL; /* Bad URI. */
   if (n != strlen (p))
     return NULL; /* Name with a Nul in it. */
   tuple = xtrycalloc (1, sizeof *tuple);
   if (!tuple)
     return NULL; /* Out of core. */
   tuple->name = p;
   if (!p2) /* We have only the name, so we assume an empty value string. */
     {
       tuple->value = p + strlen (p);
       tuple->valuelen = 0;
       tuple->no_value = 1; /* Explicitly mark that we have seen no '='. */
     }
   else /* Name and value. */
     {
       if ((n = remove_escapes (p2)) < 0)
 	{
 	  xfree (tuple);
 	  return NULL; /* Bad URI. */
 	}
       tuple->value = p2;
       tuple->valuelen = n;
     }
   return tuple;
 }
 
 
 /* Return true if STRING is likely "hostname:port" or only "hostname".  */
 static int
 is_hostname_port (const char *string)
 {
   int colons = 0;
 
   if (!string || !*string)
     return 0;
   for (; *string; string++)
     {
       if (*string == ':')
         {
           if (colons)
             return 0;
           if (!string[1])
             return 0;
           colons++;
         }
       else if (!colons && strchr (" \t\f\n\v_@[]/", *string))
         return 0; /* Invalid characters in hostname. */
       else if (colons && !digitp (string))
         return 0; /* Not a digit in the port.  */
     }
   return 1;
 }
 
 
 /* Free the PROXY object.  */
 static void
 release_proxy_info (proxy_info_t proxy)
 {
   if (!proxy)
     return;
   http_release_parsed_uri (proxy->uri);
   xfree (proxy);
 }
 
 
+/* Return an http session object.  If clear is set, the object is
+ * destroyed.  On error nULL is returned.  */
+#ifdef HAVE_W32_SYSTEM
+static HINTERNET
+w32_get_internet_session (int clear)
+{
+  static HINTERNET session;
+
+  if (clear)
+    {
+      if (session)
+        {
+          WinHttpCloseHandle (session);
+          session = NULL;
+        }
+      return NULL;
+    }
+
+  if (!session)
+    {
+      session = WinHttpOpen (L"GnuPG dirmngr",
+                             WINHTTP_ACCESS_TYPE_NO_PROXY,
+                             WINHTTP_NO_PROXY_NAME,
+                             WINHTTP_NO_PROXY_BYPASS,
+                             0);
+      if (!session)
+        {
+          log_error ("WinHttpOpen failed: %s\n", w32_strerror (-1));
+          return NULL;
+        }
+    }
+
+  return session;
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
+/* Return a proxy using a Windows API.  */
+#ifdef HAVE_W32_SYSTEM
+static char *
+w32_get_proxy (const char *url)
+{
+  WINHTTP_AUTOPROXY_OPTIONS options = {0};
+  WINHTTP_PROXY_INFO info;
+  char *result = NULL;
+  char *p;
+  wchar_t *wurl;
+  int defaultcfg = 0;
+
+  wurl = utf8_to_wchar (url);
+  if (!wurl)
+    {
+      log_error ("utf8_to_wchar failed: %s\n",
+                 gpg_strerror (gpg_error_from_syserror ()));
+      return NULL;
+    }
+
+  options.dwFlags = (WINHTTP_AUTOPROXY_ALLOW_AUTOCONFIG
+                     | WINHTTP_AUTOPROXY_ALLOW_CM
+                     | WINHTTP_AUTOPROXY_ALLOW_STATIC
+                     | WINHTTP_AUTOPROXY_AUTO_DETECT
+                     | WINHTTP_AUTOPROXY_SORT_RESULTS);
+  options.dwAutoDetectFlags = (WINHTTP_AUTO_DETECT_TYPE_DHCP
+                               | WINHTTP_AUTO_DETECT_TYPE_DNS_A);
+  options.fAutoLogonIfChallenged = TRUE;
+
+  if (opt_debug)
+    log_debug ("calling WinHttpGetProxyForUrl (%s)\n", url);
+  if (!WinHttpGetProxyForUrl (w32_get_internet_session (0),
+                              wurl, &options, &info))
+    {
+      int ec = (int)GetLastError ();
+      if (ec == ERROR_WINHTTP_AUTODETECTION_FAILED)
+        {
+          if (opt_debug)
+            log_debug ("calling WinHttpGetDefaultProxyConfiguration\n");
+          if (!WinHttpGetDefaultProxyConfiguration (&info))
+            {
+              if (opt_verbose)
+                log_info ("WinHttpGetDefaultProxyConfiguration failed: "
+                          "%s (%d)\n", w32_strerror (ec), ec);
+              xfree (wurl);
+              return NULL;
+            }
+          defaultcfg = 1;
+        }
+      else
+        {
+          if (opt_verbose)
+            log_info ("WinHttpGetProxyForUrl failed: %s (%d)\n",
+                      w32_strerror (ec), ec);
+          xfree (wurl);
+          return NULL;
+        }
+    }
+  xfree (wurl);
+
+  if (info.dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY)
+    {
+      result = wchar_to_utf8 (info.lpszProxy);
+      if (!result)
+        log_error ("wchar_to_utf8 failed: %s\n",
+                   gpg_strerror (gpg_error_from_syserror ()));
+      else
+        {
+          if (opt_debug)
+            log_debug ("proxies to use: '%s'\n", result);
+          /* The returned proxies are delimited by whitespace or
+           * semicolons.  We return only the first proxy.  */
+          for (p=result; *p; p++)
+            if (spacep (p) || *p == ';')
+              {
+                *p = 0;
+                break;
+              }
+        }
+    }
+  else if (info.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY)
+    {
+      /* No proxy shall be used.  */
+    }
+  else
+    log_error ("%s returned unexpected code %lu\n",
+               defaultcfg? "WinHttpGetDefaultProxyConfiguration"
+               :"WinHttpGetProxyForUrl", info.dwAccessType);
+
+  if (info.lpszProxy)
+    GlobalFree (info.lpszProxy);
+  if (info.lpszProxyBypass)
+    GlobalFree (info.lpszProxyBypass);
+  return result;
+}
+#endif /*HAVE_W32_SYSTEM*/
+
+
 /* Return the proxy to be used for the URL or host specified in HD.
  * If OVERRIDE_PROXY is not NULL and not empty, this proxy will be
  * used instead of any configured or dynamically determined proxy.  If
  * the function runs into an error an error code is returned and NULL
  * is stored at R_PROXY.  If the fucntion was successful and a proxy
  * is to be used, information on the procy is stored at R_PROXY; if no
  * proxy shall be used R_PROXY is set to NULL.  Caller should always
  * use release_proxy_info on the value stored at R_PROXY.  */
 static gpg_error_t
 get_proxy_for_url (http_t hd, const char *override_proxy, proxy_info_t *r_proxy)
 {
-  gpg_error_t err;
+  gpg_error_t err = 0;
   const char *proxystr, *s;
   proxy_info_t proxy;
+#ifdef HAVE_W32_SYSTEM
+  char *proxystrbuf = NULL;
+#endif
 
-  r_proxy = NULL;
+  *r_proxy = NULL;
 
   if (override_proxy && *override_proxy)
     proxystr = override_proxy;
   else if (!(hd->flags & HTTP_FLAG_TRY_PROXY))
     return 0;  /* --honor-http-proxy not active  */
   else if ((s = getenv (HTTP_PROXY_ENV)) && *s)
     proxystr = s;
 #ifdef HAVE_W32_SYSTEM
+  else if (hd->uri && hd->uri->original
+           && (proxystrbuf = w32_get_proxy (hd->uri->original)))
+    proxystr = proxystrbuf;
 #endif
   else
     return 0;  /* No proxy known.  */
 
   proxy = xtrycalloc (1, sizeof *proxy);
   if (!proxy)
     {
       err = gpg_error_from_syserror ();
       log_error ("error allocating memory for proxy\n");
-      return err;
+      goto leave;
     }
 
   err = parse_uri (&proxy->uri, proxystr, 0, 0);
   if (gpg_err_code (err) == GPG_ERR_INV_URI
       && is_hostname_port (proxystr))
     {
       /* Retry assuming a "hostname:port" string.  */
       char *tmpname = strconcat ("http://", proxystr, NULL);
       if (!tmpname)
         err = gpg_error_from_syserror ();
       else if (!parse_uri (&proxy->uri, tmpname, 0, 0))
         err = 0;
       xfree (tmpname);
     }
 
   if (!err)
     {
       /* Get rid of the escapes in the authstring.  */
       if (proxy->uri->auth)
         remove_escapes (proxy->uri->auth);
 
       if (!strcmp (proxy->uri->scheme, "http"))
         proxy->is_http_proxy = 1;
       else if (!strcmp (proxy->uri->scheme, "socks4")
                || !strcmp (proxy->uri->scheme, "socks5h"))
         err = gpg_error (GPG_ERR_NOT_IMPLEMENTED);
       else
         err = gpg_error (GPG_ERR_INV_URI);
 
       if (err)
 	{
 	  log_error ("invalid HTTP proxy (%s): %s\n",
 		     proxystr, gpg_strerror (err));
 	  err = gpg_err_make (default_errsource, GPG_ERR_CONFIGURATION);
 	}
       else if (opt_verbose)
         log_info ("using '%s' to proxy '%s'\n",
                   proxystr, hd->uri? hd->uri->original : NULL);
     }
 
+ leave:
+#ifdef HAVE_W32_SYSTEM
+  xfree (proxystrbuf);
+#endif
   if (err)
     xfree (proxy);
   else
     *r_proxy = proxy;
   return err;
 }
 
 
 /* Some checks done by send_request.  */
 static gpg_error_t
 send_request_basic_checks (http_t hd)
 {
   int mode;
 
   if (hd->uri->use_tls && !hd->session)
     {
       log_error ("TLS requested but no session object provided\n");
       return gpg_error (GPG_ERR_INTERNAL);
     }
 #ifdef USE_TLS
   if (hd->uri->use_tls && !hd->session->tls_session)
     {
       log_error ("TLS requested but no TLS context available\n");
       return gpg_error (GPG_ERR_INTERNAL);
     }
   if (opt_debug)
     log_debug ("Using TLS library: %s %s\n",
 # if HTTP_USE_NTBTLS
                "NTBTLS", ntbtls_check_version (NULL)
 # elif HTTP_USE_GNUTLS
                "GNUTLS", gnutls_check_version (NULL)
 # else
                "?", "?"
 # endif /*HTTP_USE_*TLS*/
                );
 #endif /*USE_TLS*/
 
   if ((hd->flags & HTTP_FLAG_FORCE_TOR)
       && (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode))
     {
       log_error ("Tor support is not available\n");
       return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
     }
 
   return 0;
 }
 
 
 /* Helper for send_request to set the servername.  */
 static gpg_error_t
 send_request_set_sni (http_t hd, const char *name)
 {
   gpg_error_t err = 0;
 # if HTTP_USE_GNUTLS
   int rc;
 # endif
 
   /* Try to use SNI.  */
 #ifdef USE_TLS
   if (hd->uri->use_tls)
     {
       xfree (hd->session->servername);
       hd->session->servername = xtrystrdup (name);
       if (!hd->session->servername)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
 # if HTTP_USE_NTBTLS
       err = ntbtls_set_hostname (hd->session->tls_session,
                                  hd->session->servername);
       if (err)
         {
           log_info ("ntbtls_set_hostname failed: %s\n", gpg_strerror (err));
           goto leave;
         }
 # elif HTTP_USE_GNUTLS
       rc = gnutls_server_name_set (hd->session->tls_session,
                                    GNUTLS_NAME_DNS,
                                    hd->session->servername,
                                    strlen (hd->session->servername));
       if (rc < 0)
         log_info ("gnutls_server_name_set failed: %s\n", gnutls_strerror (rc));
 # endif /*HTTP_USE_GNUTLS*/
     }
 #endif /*USE_TLS*/
 
  leave:
   return err;
 }
 
 
 /* Run the NTBTLS handshake if needed.  */
 #if HTTP_USE_NTBTLS
 static gpg_error_t
 run_ntbtls_handshake (http_t hd)
 {
   gpg_error_t err;
   estream_t in, out;
 
   if (hd->uri->use_tls)
     {
       my_socket_ref (hd->sock);
 
       /* Until we support send/recv in estream under Windows we need
        * to use es_fopencookie.  */
 #ifdef HAVE_W32_SYSTEM
       in = es_fopencookie ((void*)(unsigned int)hd->sock->fd, "rb",
                            simple_cookie_functions);
 #else
       in = es_fdopen_nc (hd->sock->fd, "rb");
 #endif
       if (!in)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
 #ifdef HAVE_W32_SYSTEM
       out = es_fopencookie ((void*)(unsigned int)hd->sock->fd, "wb",
                             simple_cookie_functions);
 #else
       out = es_fdopen_nc (hd->sock->fd, "wb");
 #endif
       if (!out)
         {
           err = gpg_error_from_syserror ();
           es_fclose (in);
           goto leave;
         }
 
       err = ntbtls_set_transport (hd->session->tls_session, in, out);
       if (err)
         {
           log_info ("TLS set_transport failed: %s <%s>\n",
                     gpg_strerror (err), gpg_strsource (err));
           es_fclose (in);
           es_fclose (out);
           goto leave;
         }
 
       if (hd->session->verify_cb)
         {
           err = ntbtls_set_verify_cb (hd->session->tls_session,
                                       my_ntbtls_verify_cb, hd);
           if (err)
             {
               log_error ("ntbtls_set_verify_cb failed: %s\n",
                          gpg_strerror (err));
               goto leave;
             }
         }
 
       while ((err = ntbtls_handshake (hd->session->tls_session)))
         {
           unsigned int tlevel, ttype;
           const char *s;
 
           s = ntbtls_get_last_alert (hd->session->tls_session, &tlevel, &ttype);
           if (s)
             log_info ("TLS alert: %s (%u.%u)\n", s, tlevel, ttype);
 
           switch (err)
             {
             default:
               log_info ("TLS handshake failed: %s <%s>\n",
                         gpg_strerror (err), gpg_strsource (err));
               goto leave;
             }
         }
 
       hd->session->verify.done = 0;
 
       /* Note that in contrast to GNUTLS NTBTLS uses a registered
        * callback to run the verification as part of the handshake.  */
       err = 0;
       /* FIXME: We could check that the CB has been called and if not
        * error out with this warning:
        * if (err)
        *   {
        *     log_info ("TLS connection authentication failed: %s <%s>\n",
        *               gpg_strerror (err), gpg_strsource (err));
        *     goto leave;
        *   }
        */
        }
   else
     err = 0;
 
  leave:
   return err;
 }
 #endif /*HTTP_USE_NTBTLS*/
 
 
 /* Run the GNUTLS handshake if needed.  */
 #if HTTP_USE_GNUTLS
 static gpg_error_t
 run_gnutls_handshake (http_t hd, const char *server)
 {
   gpg_error_t err;
   int rc;
 
   if (hd->uri->use_tls)
     {
       my_socket_ref (hd->sock);
       gnutls_transport_set_ptr (hd->session->tls_session, hd->sock);
       gnutls_transport_set_pull_function (hd->session->tls_session,
                                           my_gnutls_read);
       gnutls_transport_set_push_function (hd->session->tls_session,
                                           my_gnutls_write);
 
     handshake_again:
       do
         {
           rc = gnutls_handshake (hd->session->tls_session);
         }
       while (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN);
       if (rc < 0)
         {
           if (rc == GNUTLS_E_WARNING_ALERT_RECEIVED
               || rc == GNUTLS_E_FATAL_ALERT_RECEIVED)
             {
               gnutls_alert_description_t alertno;
               const char *alertstr;
 
               alertno = gnutls_alert_get (hd->session->tls_session);
               alertstr = gnutls_alert_get_name (alertno);
               log_info ("TLS handshake %s: %s (alert %d)\n",
                         rc == GNUTLS_E_WARNING_ALERT_RECEIVED
                         ? "warning" : "failed",
                         alertstr, (int)alertno);
               if (alertno == GNUTLS_A_UNRECOGNIZED_NAME && server)
                 log_info ("  (sent server name '%s')\n", server);
 
               if (rc == GNUTLS_E_WARNING_ALERT_RECEIVED)
                 goto handshake_again;
             }
           else
             log_info ("TLS handshake failed: %s\n", gnutls_strerror (rc));
           err = gpg_error (GPG_ERR_NETWORK);
           goto leave;
         }
 
       hd->session->verify.done = 0;
       if (tls_callback)
         err = tls_callback (hd, hd->session, 0);
       else
         err = http_verify_server_credentials (hd->session);
       if (err)
         {
           log_info ("TLS connection authentication failed: %s\n",
                     gpg_strerror (err));
           goto leave;
         }
     }
   else
     err =0;
 
  leave:
   return err;
 }
 #endif /*HTTP_USE_GNUTLS*/
 
 
 /*
  * Send a HTTP request to the server
  * Returns 0 if the request was successful
  */
 static gpg_error_t
 send_request (http_t hd, const char *httphost, const char *auth,
 	      const char *override_proxy,
               const char *srvtag, unsigned int timeout,
               strlist_t headers)
 {
   gpg_error_t err;
   const char *server;
   char *request = NULL;
   char *relpath = NULL;
   unsigned short port;
   int use_http_proxy = 0;
   char *proxy_authstr = NULL;
   char *authstr = NULL;
   assuan_fd_t sock;
   proxy_info_t proxy = NULL;
 
   err = send_request_basic_checks (hd);
   if (err)
     goto leave;
 
   if ((hd->flags & HTTP_FLAG_FORCE_TOR))
     {
       /* Non-blocking connects do not work with our Tor proxy because
        * we can't continue the Socks protocol after the EINPROGRESS.
        * Disable the timeout to use a blocking connect.  */
       timeout = 0;
     }
 
   server = *hd->uri->host ? hd->uri->host : "localhost";
   port = hd->uri->port ? hd->uri->port : 80;
 
   if ((err = send_request_set_sni (hd, httphost? httphost : server)))
     goto leave;
 
   if ((err = get_proxy_for_url (hd, override_proxy, &proxy)))
     goto leave;
 
   if (proxy && proxy->is_http_proxy)
     {
       use_http_proxy = 1;  /* We want to use a proxy for the conenction.  */
       err = connect_server (*proxy->uri->host ? proxy->uri->host : "localhost",
                             proxy->uri->port ? proxy->uri->port : 80,
                             hd->flags, NULL, timeout, &sock);
     }
   else
     {
       err = connect_server (server, port, hd->flags, srvtag, timeout, &sock);
     }
   if (err)
     goto leave;
 
   hd->sock = my_socket_new (sock);
   if (!hd->sock)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
 #if USE_TLS
   if (use_http_proxy && hd->uri->use_tls)
     {
       int saved_flags;
 
       log_assert (!proxy_authstr);
       if (proxy->uri->auth
           && !(proxy_authstr = make_header_line ("Proxy-Authorization: Basic ",
                                                  "\r\n",
                                                  proxy->uri->auth,
                                                  strlen (proxy->uri->auth))))
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
       /* Try to use the CONNECT method to proxy our TLS stream.  */
       xfree (request);
       request = es_bsprintf
         ("CONNECT %s:%hu HTTP/1.0\r\nHost: %s:%hu\r\n%s",
          httphost ? httphost : server,
          port,
          httphost ? httphost : server,
          port,
          proxy_authstr ? proxy_authstr : "");
       if (!request)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
       if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
         log_debug_with_string (request, "http.c:request:");
 
       err = make_fp_write (hd, 0, NULL);
       if (err)
         goto leave;
 
       if (es_fputs (request, hd->fp_write) || es_fflush (hd->fp_write))
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
       /* Make sure http_wait_response doesn't close the stream.  */
       saved_flags = hd->flags;
       hd->flags &= ~HTTP_FLAG_SHUTDOWN;
 
       /* Get the response and set hd->fp_read  */
       err = http_wait_response (hd);
 
       /* Restore flags, destroy stream.  */
       hd->flags = saved_flags;
       es_fclose (hd->fp_read);
       hd->fp_read = NULL;
       hd->read_cookie = NULL;
 
       /* Reset state.  */
       hd->in_data = 0;
 
       if (err)
         goto leave;
 
       if (hd->status_code != 200)
         {
           char *tmpstr;
 
           tmpstr = es_bsprintf ("%s:%hu", httphost ? httphost : server, port);
           log_error (_("error accessing '%s': http status %u\n"),
                      tmpstr ? tmpstr : "out of core",
                      http_get_status_code (hd));
           xfree (tmpstr);
           err = gpg_error (GPG_ERR_NO_DATA);
           goto leave;
         }
 
       /* We are done with the proxy, the code below will establish a
        * TLS session and talk directly to the target server.  Thus we
        * clear the flag to indicate this.  */
       use_http_proxy = 0;
     }
 #endif	/* USE_TLS */
 
 #if HTTP_USE_NTBTLS
   err = run_ntbtls_handshake (hd);
 #elif HTTP_USE_GNUTLS
   err = run_gnutls_handshake (hd, server);
 #else
   err = 0;
 #endif
   if (err)
     goto leave;
 
   if (auth || hd->uri->auth)
     {
       char *myauth;
 
       if (auth)
         {
           myauth = xtrystrdup (auth);
           if (!myauth)
             {
               err = gpg_error_from_syserror ();
               goto leave;
             }
           remove_escapes (myauth);
         }
       else
         {
           remove_escapes (hd->uri->auth);
           myauth = hd->uri->auth;
         }
 
       authstr = make_header_line ("Authorization: Basic ", "\r\n",
                                   myauth, strlen (myauth));
       if (auth)  /* (Was allocated.)  */
         xfree (myauth);
 
       if (!authstr)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
     }
 
   relpath = build_rel_path (hd->uri);
   if (!relpath)
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
   if (use_http_proxy)
     {
       xfree (proxy_authstr);
       proxy_authstr = NULL;
       if (proxy->uri->auth
           && !(proxy_authstr = make_header_line ("Proxy-Authorization: Basic ",
                                                  "\r\n",
                                                  proxy->uri->auth,
                                                  strlen (proxy->uri->auth))))
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
 
       xfree (request);
       request = es_bsprintf
         ("%s %s://%s:%hu%s%s HTTP/1.0\r\n%s%s",
          hd->req_type == HTTP_REQ_GET ? "GET" :
          hd->req_type == HTTP_REQ_HEAD ? "HEAD" :
          hd->req_type == HTTP_REQ_POST ? "POST" : "OOPS",
          hd->uri->use_tls? "https" : "http",
          httphost? httphost : server,
          port, *relpath == '/' ? "" : "/", relpath,
          authstr ? authstr : "",
          proxy_authstr ? proxy_authstr : "");
       if (!request)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
     }
   else
     {
       char portstr[35];
 
       if (port == (hd->uri->use_tls? 443 : 80))
         *portstr = 0;
       else
         snprintf (portstr, sizeof portstr, ":%u", port);
 
       xfree (request);
       request = es_bsprintf
         ("%s %s%s HTTP/1.0\r\nHost: %s%s\r\n%s",
          hd->req_type == HTTP_REQ_GET ? "GET" :
          hd->req_type == HTTP_REQ_HEAD ? "HEAD" :
          hd->req_type == HTTP_REQ_POST ? "POST" : "OOPS",
          *relpath == '/' ? "" : "/", relpath,
          httphost? httphost : server,
          portstr,
          authstr? authstr:"");
       if (!request)
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
     }
 
   if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
     log_debug_with_string (request, "http.c:request:");
 
   /* First setup estream so that we can write even the first line
      using estream.  This is also required for the sake of gnutls. */
   err = make_fp_write (hd, hd->uri->use_tls, hd->session);
   if (err)
     goto leave;
 
   if (es_fputs (request, hd->fp_write) || es_fflush (hd->fp_write))
     {
       err = gpg_error_from_syserror ();
       goto leave;
     }
 
   for (;headers; headers=headers->next)
     {
       if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
         log_debug_with_string (headers->d, "http.c:request-header:");
       if ((es_fputs (headers->d, hd->fp_write) || es_fflush (hd->fp_write))
             || (es_fputs("\r\n",hd->fp_write) || es_fflush(hd->fp_write)))
         {
           err = gpg_error_from_syserror ();
           goto leave;
         }
     }
 
  leave:
   es_free (request);
   xfree (authstr);
   xfree (proxy_authstr);
   xfree (relpath);
   release_proxy_info (proxy);
 
   return err;
 }
 
 
 /*
  * Build the relative path from the parsed URI.  Minimal
  * implementation.  May return NULL in case of memory failure; errno
  * is then set accordingly.
  */
 static char *
 build_rel_path (parsed_uri_t uri)
 {
   uri_tuple_t r;
   char *rel_path, *p;
   int n;
 
   /* Count the needed space. */
   n = insert_escapes (NULL, uri->path, "%;?&");
   /* TODO: build params. */
   for (r = uri->query; r; r = r->next)
     {
       n++; /* '?'/'&' */
       n += insert_escapes (NULL, r->name, "%;?&=");
       if (!r->no_value)
 	{
 	  n++; /* '=' */
 	  n += insert_escapes (NULL, r->value, "%;?&=");
 	}
     }
   n++;
 
   /* Now allocate and copy. */
   p = rel_path = xtrymalloc (n);
   if (!p)
     return NULL;
   n = insert_escapes (p, uri->path, "%;?&");
   p += n;
   /* TODO: add params. */
   for (r = uri->query; r; r = r->next)
     {
       *p++ = r == uri->query ? '?' : '&';
       n = insert_escapes (p, r->name, "%;?&=");
       p += n;
       if (!r->no_value)
 	{
 	  *p++ = '=';
 	  /* TODO: Use valuelen. */
 	  n = insert_escapes (p, r->value, "%;?&=");
 	  p += n;
 	}
     }
   *p = 0;
   return rel_path;
 }
 
 
 /* Transform a header name into a standard capitalized format; e.g.
    "Content-Type".  Conversion stops at the colon.  As usual we don't
    use the localized versions of ctype.h. */
 static void
 capitalize_header_name (char *name)
 {
   int first = 1;
 
   for (; *name && *name != ':'; name++)
     {
       if (*name == '-')
         first = 1;
       else if (first)
         {
           if (*name >= 'a' && *name <= 'z')
             *name = *name - 'a' + 'A';
           first = 0;
         }
       else if (*name >= 'A' && *name <= 'Z')
         *name = *name - 'A' + 'a';
     }
 }
 
 
 /* Store an HTTP header line in LINE away.  Line continuation is
    supported as well as merging of headers with the same name. This
    function may modify LINE. */
 static gpg_err_code_t
 store_header (http_t hd, char *line)
 {
   size_t n;
   char *p, *value;
   header_t h;
 
   n = strlen (line);
   if (n && line[n-1] == '\n')
     {
       line[--n] = 0;
       if (n && line[n-1] == '\r')
         line[--n] = 0;
     }
   if (!n)  /* we are never called to hit this. */
     return GPG_ERR_BUG;
   if (*line == ' ' || *line == '\t')
     {
       /* Continuation. This won't happen too often as it is not
          recommended.  We use a straightforward implementation. */
       if (!hd->headers)
         return GPG_ERR_PROTOCOL_VIOLATION;
       n += strlen (hd->headers->value);
       p = xtrymalloc (n+1);
       if (!p)
         return gpg_err_code_from_syserror ();
       strcpy (stpcpy (p, hd->headers->value), line);
       xfree (hd->headers->value);
       hd->headers->value = p;
       return 0;
     }
 
   capitalize_header_name (line);
   p = strchr (line, ':');
   if (!p)
     return GPG_ERR_PROTOCOL_VIOLATION;
   *p++ = 0;
   while (*p == ' ' || *p == '\t')
     p++;
   value = p;
 
   for (h=hd->headers; h; h = h->next)
     if ( !strcmp (h->name, line) )
       break;
   if (h)
     {
       /* We have already seen a line with that name.  Thus we assume
        * it is a comma separated list and merge them.  */
       p = strconcat (h->value, ",", value, NULL);
       if (!p)
         return gpg_err_code_from_syserror ();
       xfree (h->value);
       h->value = p;
       return 0;
     }
 
   /* Append a new header. */
   h = xtrymalloc (sizeof *h + strlen (line));
   if (!h)
     return gpg_err_code_from_syserror ();
   strcpy (h->name, line);
   h->value = xtrymalloc (strlen (value)+1);
   if (!h->value)
     {
       xfree (h);
       return gpg_err_code_from_syserror ();
     }
   strcpy (h->value, value);
   h->next = hd->headers;
   hd->headers = h;
 
   return 0;
 }
 
 
 /* Return the header NAME from the last response.  The returned value
    is valid as along as HD has not been closed and no other request
    has been send. If the header was not found, NULL is returned.  NAME
    must be canonicalized, that is the first letter of each dash
    delimited part must be uppercase and all other letters lowercase.  */
 const char *
 http_get_header (http_t hd, const char *name)
 {
   header_t h;
 
   for (h=hd->headers; h; h = h->next)
     if ( !strcmp (h->name, name) )
       return h->value;
   return NULL;
 }
 
 
 /* Return a newly allocated and NULL terminated array with pointers to
    header names.  The array must be released with xfree() and its
    content is only values as long as no other request has been
    send.  */
 const char **
 http_get_header_names (http_t hd)
 {
   const char **array;
   size_t n;
   header_t h;
 
   for (n=0, h = hd->headers; h; h = h->next)
     n++;
   array = xtrycalloc (n+1, sizeof *array);
   if (array)
     {
       for (n=0, h = hd->headers; h; h = h->next)
         array[n++] = h->name;
     }
 
   return array;
 }
 
 
 /*
  * Parse the response from a server.
  * Returns: Errorcode and sets some files in the handle
  */
 static gpg_err_code_t
 parse_response (http_t hd)
 {
   char *line, *p, *p2;
   size_t maxlen, len;
   cookie_t cookie = hd->read_cookie;
   const char *s;
 
   /* Delete old header lines.  */
   while (hd->headers)
     {
       header_t tmp = hd->headers->next;
       xfree (hd->headers->value);
       xfree (hd->headers);
       hd->headers = tmp;
     }
 
   /* Wait for the status line. */
   do
     {
       maxlen = MAX_LINELEN;
       len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
       line = hd->buffer;
       if (!line)
 	return gpg_err_code_from_syserror (); /* Out of core. */
       if (!maxlen)
 	return GPG_ERR_TRUNCATED; /* Line has been truncated. */
       if (!len)
 	return GPG_ERR_EOF;
 
       if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
         log_debug_with_string (line, "http.c:response:\n");
     }
   while (!*line);
 
   if ((p = strchr (line, '/')))
     *p++ = 0;
   if (!p || strcmp (line, "HTTP"))
     return 0; /* Assume http 0.9. */
 
   if ((p2 = strpbrk (p, " \t")))
     {
       *p2++ = 0;
       p2 += strspn (p2, " \t");
     }
   if (!p2)
     return 0; /* Also assume http 0.9. */
   p = p2;
   /* TODO: Add HTTP version number check. */
   if ((p2 = strpbrk (p, " \t")))
     *p2++ = 0;
   if (!isdigit ((unsigned int)p[0]) || !isdigit ((unsigned int)p[1])
       || !isdigit ((unsigned int)p[2]) || p[3])
     {
       /* Malformed HTTP status code - assume http 0.9. */
       hd->is_http_0_9 = 1;
       hd->status_code = 200;
       return 0;
     }
   hd->status_code = atoi (p);
 
   /* Skip all the header lines and wait for the empty line. */
   do
     {
       maxlen = MAX_LINELEN;
       len = es_read_line (hd->fp_read, &hd->buffer, &hd->buffer_size, &maxlen);
       line = hd->buffer;
       if (!line)
 	return gpg_err_code_from_syserror (); /* Out of core. */
       /* Note, that we can silently ignore truncated lines. */
       if (!len)
 	return GPG_ERR_EOF;
       /* Trim line endings of empty lines. */
       if ((*line == '\r' && line[1] == '\n') || *line == '\n')
 	*line = 0;
       if (opt_debug || (hd->flags & HTTP_FLAG_LOG_RESP))
         log_info ("http.c:RESP: '%.*s'\n",
                   (int)strlen(line)-(*line&&line[1]?2:0),line);
       if (*line)
         {
           gpg_err_code_t ec = store_header (hd, line);
           if (ec)
             return ec;
         }
     }
   while (len && *line);
 
   cookie->content_length_valid = 0;
   if (!(hd->flags & HTTP_FLAG_IGNORE_CL))
     {
       s = http_get_header (hd, "Content-Length");
       if (s)
         {
           cookie->content_length_valid = 1;
           cookie->content_length = string_to_u64 (s);
         }
     }
 
   return 0;
 }
 
 #if 0
 static int
 start_server ()
 {
   struct sockaddr_in mya;
   struct sockaddr_in peer;
   int fd, client;
   fd_set rfds;
   int addrlen;
   int i;
 
   if ((fd = socket (AF_INET, SOCK_STREAM, 0)) == -1)
     {
       log_error ("socket() failed: %s\n", strerror (errno));
       return -1;
     }
   i = 1;
   if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (byte *) & i, sizeof (i)))
     log_info ("setsockopt(SO_REUSEADDR) failed: %s\n", strerror (errno));
 
   mya.sin_family = AF_INET;
   memset (&mya.sin_addr, 0, sizeof (mya.sin_addr));
   mya.sin_port = htons (11371);
 
   if (bind (fd, (struct sockaddr *) &mya, sizeof (mya)))
     {
       log_error ("bind to port 11371 failed: %s\n", strerror (errno));
       sock_close (fd);
       return -1;
     }
 
   if (listen (fd, 5))
     {
       log_error ("listen failed: %s\n", strerror (errno));
       sock_close (fd);
       return -1;
     }
 
   for (;;)
     {
       FD_ZERO (&rfds);
       FD_SET (fd, &rfds);
 
       if (my_select (fd + 1, &rfds, NULL, NULL, NULL) <= 0)
 	continue;		/* ignore any errors */
 
       if (!FD_ISSET (fd, &rfds))
 	continue;
 
       addrlen = sizeof peer;
       client = my_accept (fd, (struct sockaddr *) &peer, &addrlen);
       if (client == -1)
 	continue;		/* oops */
 
       log_info ("connect from %s\n", inet_ntoa (peer.sin_addr));
 
       fflush (stdout);
       fflush (stderr);
       if (!fork ())
 	{
 	  int c;
 	  FILE *fp;
 
 	  fp = fdopen (client, "r");
 	  while ((c = getc (fp)) != EOF)
 	    putchar (c);
 	  fclose (fp);
 	  exit (0);
 	}
       sock_close (client);
     }
 
 
   return 0;
 }
 #endif
 
 
 
 /* Return true if SOCKS shall be used.  This is the case if tor_mode
  * is enabled and the desired address is not the loopback address.
  * This function is basically a copy of the same internal function in
  * Libassuan.  */
 static int
 use_socks (struct sockaddr_storage *addr)
 {
   int mode;
 
   if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
     return 0;  /* Not in Tor mode.  */
   else if (addr->ss_family == AF_INET6)
     {
       struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr;
       const unsigned char *s;
       int i;
 
       s = (unsigned char *)&addr_in6->sin6_addr.s6_addr;
       if (s[15] != 1)
         return 1;   /* Last octet is not 1 - not the loopback address.  */
       for (i=0; i < 15; i++, s++)
         if (*s)
           return 1; /* Non-zero octet found - not the loopback address.  */
 
       return 0; /* This is the loopback address.  */
     }
   else if (addr->ss_family == AF_INET)
     {
       struct sockaddr_in *addr_in = (struct sockaddr_in *)addr;
 
       if (*(unsigned char*)&addr_in->sin_addr.s_addr == 127)
         return 0; /* Loopback (127.0.0.0/8) */
 
       return 1;
     }
   else
     return 0;
 }
 
 
 /* Wrapper around assuan_sock_new which takes the domain from an
  * address parameter.  */
 static assuan_fd_t
 my_sock_new_for_addr (struct sockaddr_storage *addr, int type, int proto)
 {
   int domain;
 
   if (use_socks (addr))
     {
       /* Libassaun always uses 127.0.0.1 to connect to the socks
        * server (i.e. the Tor daemon).  */
       domain = AF_INET;
     }
   else
     domain = addr->ss_family;
 
   return assuan_sock_new (domain, type, proto);
 }
 
 
 /* Call WSAGetLastError and map it to a libgpg-error.  */
 #ifdef HAVE_W32_SYSTEM
 static gpg_error_t
 my_wsagetlasterror (void)
 {
   int wsaerr;
   gpg_err_code_t ec;
 
   wsaerr = WSAGetLastError ();
   switch (wsaerr)
     {
     case WSAENOTSOCK:        ec = GPG_ERR_EINVAL;       break;
     case WSAEWOULDBLOCK:     ec = GPG_ERR_EAGAIN;       break;
     case ERROR_BROKEN_PIPE:  ec = GPG_ERR_EPIPE;        break;
     case WSANOTINITIALISED:  ec = GPG_ERR_ENOSYS;       break;
     case WSAENOBUFS:         ec = GPG_ERR_ENOBUFS;      break;
     case WSAEMSGSIZE:        ec = GPG_ERR_EMSGSIZE;     break;
     case WSAECONNREFUSED:    ec = GPG_ERR_ECONNREFUSED; break;
     case WSAEISCONN:         ec = GPG_ERR_EISCONN;      break;
     case WSAEALREADY:        ec = GPG_ERR_EALREADY;     break;
     case WSAETIMEDOUT:       ec = GPG_ERR_ETIMEDOUT;    break;
     default:                 ec = GPG_ERR_EIO;          break;
     }
 
   return gpg_err_make (default_errsource, ec);
 }
 #endif /*HAVE_W32_SYSTEM*/
 
 
 /* Connect SOCK and return GPG_ERR_ETIMEOUT if a connection could not
  * be established within TIMEOUT milliseconds.  0 indicates the
  * system's default timeout.  The other args are the usual connect
  * args.  On success 0 is returned, on timeout GPG_ERR_ETIMEDOUT, and
  * another error code for other errors.  On timeout the caller needs
  * to close the socket as soon as possible to stop an ongoing
  * handshake.
  *
  * This implementation is for well-behaving systems; see Stevens,
  * Network Programming, 2nd edition, Vol 1, 15.4.  */
 static gpg_error_t
 connect_with_timeout (assuan_fd_t sock,
                       struct sockaddr *addr, int addrlen,
                       unsigned int timeout)
 {
   gpg_error_t err;
   int syserr;
   socklen_t slen;
   fd_set rset, wset;
   struct timeval tval;
   int n;
 
 #ifndef HAVE_W32_SYSTEM
   int oflags;
 # define RESTORE_BLOCKING()  do {  \
     fcntl (sock, F_SETFL, oflags); \
   } while (0)
 #else /*HAVE_W32_SYSTEM*/
 # define RESTORE_BLOCKING()  do {                       \
     unsigned long along = 0;                            \
     ioctlsocket (FD2INT (sock), FIONBIO, &along);       \
   } while (0)
 #endif /*HAVE_W32_SYSTEM*/
 
 
   if (!timeout)
     {
       /* Shortcut.  */
       if (assuan_sock_connect (sock, addr, addrlen))
         err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
       else
         err = 0;
       return err;
     }
 
   /* Switch the socket into non-blocking mode.  */
 #ifdef HAVE_W32_SYSTEM
   {
     unsigned long along = 1;
     if (ioctlsocket (FD2INT (sock), FIONBIO, &along))
       return my_wsagetlasterror ();
   }
 #else
   oflags = fcntl (sock, F_GETFL, 0);
   if (fcntl (sock, F_SETFL, oflags | O_NONBLOCK))
     return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
 #endif
 
   /* Do the connect.  */
   if (!assuan_sock_connect (sock, addr, addrlen))
     {
       /* Immediate connect.  Restore flags. */
       RESTORE_BLOCKING ();
       return 0; /* Success.  */
     }
   err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
   if (gpg_err_code (err) != GPG_ERR_EINPROGRESS
 #ifdef HAVE_W32_SYSTEM
       && gpg_err_code (err) != GPG_ERR_EAGAIN
 #endif
       )
     {
       RESTORE_BLOCKING ();
       return err;
     }
 
   FD_ZERO (&rset);
   FD_SET (FD2INT (sock), &rset);
   wset = rset;
   tval.tv_sec = timeout / 1000;
   tval.tv_usec = (timeout % 1000) * 1000;
 
   n = my_select (FD2INT(sock)+1, &rset, &wset, NULL, &tval);
   if (n < 0)
     {
       err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
       RESTORE_BLOCKING ();
       return err;
     }
   if (!n)
     {
       /* Timeout: We do not restore the socket flags on timeout
        * because the caller is expected to close the socket.  */
       return gpg_err_make (default_errsource, GPG_ERR_ETIMEDOUT);
     }
   if (!FD_ISSET (sock, &rset) && !FD_ISSET (sock, &wset))
     {
       /* select misbehaved.  */
       return gpg_err_make (default_errsource, GPG_ERR_SYSTEM_BUG);
     }
 
   slen = sizeof (syserr);
   if (getsockopt (FD2INT(sock), SOL_SOCKET, SO_ERROR,
                   (void*)&syserr, &slen) < 0)
     {
       /* Assume that this is Solaris which returns the error in ERRNO.  */
       err = gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
     }
   else if (syserr)
     err = gpg_err_make (default_errsource, gpg_err_code_from_errno (syserr));
   else
     err = 0; /* Connected.  */
 
   RESTORE_BLOCKING ();
 
   return err;
 
 #undef RESTORE_BLOCKING
 }
 
 
 /* Actually connect to a server.  On success 0 is returned and the
  * file descriptor for the socket is stored at R_SOCK; on error an
  * error code is returned and ASSUAN_INVALID_FD is stored at R_SOCK.
  * TIMEOUT is the connect timeout in milliseconds.  Note that the
  * function tries to connect to all known addresses and the timeout is
  * for each one. */
 static gpg_error_t
 connect_server (const char *server, unsigned short port,
                 unsigned int flags, const char *srvtag, unsigned int timeout,
                 assuan_fd_t *r_sock)
 {
   gpg_error_t err;
   assuan_fd_t sock = ASSUAN_INVALID_FD;
   unsigned int srvcount = 0;
   int hostfound = 0;
   int anyhostaddr = 0;
   int srv, connected, v4_valid, v6_valid;
   gpg_error_t last_err = 0;
   struct srventry *serverlist = NULL;
 
   *r_sock = ASSUAN_INVALID_FD;
 
 #if defined(HAVE_W32_SYSTEM) && !defined(HTTP_NO_WSASTARTUP)
   init_sockets ();
 #endif /*Windows*/
 
   check_inet_support (&v4_valid, &v6_valid);
 
   /* Onion addresses require special treatment.  */
   if (is_onion_address (server))
     {
 #ifdef ASSUAN_SOCK_TOR
 
       if (opt_debug)
         log_debug ("http.c:connect_server:onion: name='%s' port=%hu\n",
                    server, port);
       sock = assuan_sock_connect_byname (server, port, 0, NULL,
                                          ASSUAN_SOCK_TOR);
       if (sock == ASSUAN_INVALID_FD)
         {
           err = gpg_err_make (default_errsource,
                               (errno == EHOSTUNREACH)? GPG_ERR_UNKNOWN_HOST
                               : gpg_err_code_from_syserror ());
           log_error ("can't connect to '%s': %s\n", server, gpg_strerror (err));
           return err;
         }
 
       notify_netactivity ();
       *r_sock = sock;
       return 0;
 
 #else /*!ASSUAN_SOCK_TOR*/
 
       err = gpg_err_make (default_errsource, GPG_ERR_ENETUNREACH);
       return ASSUAN_INVALID_FD;
 
 #endif /*!HASSUAN_SOCK_TOR*/
     }
 
   /* Do the SRV thing */
   if (srvtag)
     {
       err = get_dns_srv (server, srvtag, NULL, &serverlist, &srvcount);
       if (err)
         log_info ("getting '%s' SRV for '%s' failed: %s\n",
                   srvtag, server, gpg_strerror (err));
       /* Note that on error SRVCOUNT is zero.  */
       err = 0;
     }
 
   if (!serverlist)
     {
       /* Either we're not using SRV, or the SRV lookup failed.  Make
 	 up a fake SRV record. */
       serverlist = xtrycalloc (1, sizeof *serverlist);
       if (!serverlist)
         return gpg_err_make (default_errsource, gpg_err_code_from_syserror ());
 
       serverlist->port = port;
       strncpy (serverlist->target, server, DIMof (struct srventry, target));
       serverlist->target[DIMof (struct srventry, target)-1] = '\0';
       srvcount = 1;
     }
 
   connected = 0;
   for (srv=0; srv < srvcount && !connected; srv++)
     {
       dns_addrinfo_t aibuf, ai;
 
       if (opt_debug)
         log_debug ("http.c:connect_server: trying name='%s' port=%hu\n",
                    serverlist[srv].target, port);
       err = resolve_dns_name (serverlist[srv].target, port, 0, SOCK_STREAM,
                               &aibuf, NULL);
       if (err)
         {
           log_info ("resolving '%s' failed: %s\n",
                     serverlist[srv].target, gpg_strerror (err));
           last_err = err;
           continue; /* Not found - try next one. */
         }
       hostfound = 1;
 
       for (ai = aibuf; ai && !connected; ai = ai->next)
         {
           if (ai->family == AF_INET
               && ((flags & HTTP_FLAG_IGNORE_IPv4) || !v4_valid))
             continue;
           if (ai->family == AF_INET6
               && ((flags & HTTP_FLAG_IGNORE_IPv6) || !v6_valid))
             continue;
 
           if (sock != ASSUAN_INVALID_FD)
             assuan_sock_close (sock);
           sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol);
           if (sock == ASSUAN_INVALID_FD)
             {
               if (errno == EAFNOSUPPORT)
                 {
                   if (ai->family == AF_INET)
                     v4_valid = 0;
                   if (ai->family == AF_INET6)
                     v6_valid = 0;
                   continue;
                 }
 
               err = gpg_err_make (default_errsource,
                                   gpg_err_code_from_syserror ());
               log_error ("error creating socket: %s\n", gpg_strerror (err));
               free_dns_addrinfo (aibuf);
               xfree (serverlist);
               return err;
             }
 
           anyhostaddr = 1;
           err = connect_with_timeout (sock, (struct sockaddr *)ai->addr,
                                       ai->addrlen, timeout);
           if (err)
             {
               last_err = err;
             }
           else
             {
               connected = 1;
               notify_netactivity ();
             }
         }
       free_dns_addrinfo (aibuf);
     }
 
   xfree (serverlist);
 
   if (!connected)
     {
       if (!hostfound)
         {
           log_error ("can't connect to '%s': %s\n",
                      server, "host not found");
           /* If the resolver told us "no name" translate this in this
            * case to "unknown host".  */
           if (gpg_err_code (last_err) == GPG_ERR_NO_NAME)
             last_err = 0;
         }
       else if (!anyhostaddr)
         log_error ("can't connect to '%s': %s\n",
                    server, "no IP address for host");
       else
         {
 #ifdef HAVE_W32_SYSTEM
         log_error ("can't connect to '%s': ec=%d\n",
                    server, (int)WSAGetLastError());
 #else
         log_error ("can't connect to '%s': %s\n",
                    server, gpg_strerror (last_err));
 #endif
         }
       err = last_err? last_err : gpg_err_make (default_errsource,
                                                GPG_ERR_UNKNOWN_HOST);
       if (sock != ASSUAN_INVALID_FD)
 	assuan_sock_close (sock);
       return err;
     }
 
   *r_sock = sock;
   return 0;
 }
 
 
 /* Helper to read from a socket.  This handles npth things and
  * EINTR.  */
 static gpgrt_ssize_t
 read_server (assuan_fd_t sock, void *buffer, size_t size)
 {
   int nread;
 
   do
     {
 #ifdef HAVE_W32_SYSTEM
       /* Under Windows we need to use recv for a socket.  */
 # if defined(USE_NPTH)
       npth_unprotect ();
 # endif
       nread = recv (FD2INT (sock), buffer, size, 0);
 # if defined(USE_NPTH)
       npth_protect ();
 # endif
 
 #else /*!HAVE_W32_SYSTEM*/
 
 # ifdef USE_NPTH
       nread = npth_read (sock, buffer, size);
 # else
       nread = read (sock, buffer, size);
 # endif
 
 #endif /*!HAVE_W32_SYSTEM*/
     }
   while (nread == -1 && errno == EINTR);
 
   return nread;
 }
 
 
 static gpg_error_t
 write_server (assuan_fd_t sock, const char *data, size_t length)
 {
   int nleft;
   int nwritten;
 
   nleft = length;
   while (nleft > 0)
     {
 #if defined(HAVE_W32_SYSTEM)
 # if defined(USE_NPTH)
       npth_unprotect ();
 # endif
       nwritten = send (FD2INT (sock), data, nleft, 0);
 # if defined(USE_NPTH)
       npth_protect ();
 # endif
       if ( nwritten == SOCKET_ERROR )
         {
           log_info ("network write failed: ec=%d\n", (int)WSAGetLastError ());
           return gpg_error (GPG_ERR_NETWORK);
         }
 #else /*!HAVE_W32_SYSTEM*/
 # ifdef USE_NPTH
       nwritten = npth_write (sock, data, nleft);
 # else
       nwritten = write (sock, data, nleft);
 # endif
       if (nwritten == -1)
 	{
 	  if (errno == EINTR)
 	    continue;
 	  if (errno == EAGAIN)
 	    {
 	      struct timeval tv;
 
 	      tv.tv_sec = 0;
 	      tv.tv_usec = 50000;
 	      my_select (0, NULL, NULL, NULL, &tv);
 	      continue;
 	    }
 	  log_info ("network write failed: %s\n", strerror (errno));
 	  return gpg_error_from_syserror ();
 	}
 #endif /*!HAVE_W32_SYSTEM*/
       nleft -= nwritten;
       data += nwritten;
     }
 
   return 0;
 }
 
 
 
 /* Read handler for estream.  */
 static gpgrt_ssize_t
 cookie_read (void *cookie, void *buffer, size_t size)
 {
   cookie_t c = cookie;
   int nread;
 
   if (c->content_length_valid)
     {
       if (!c->content_length)
         return 0; /* EOF */
       if (c->content_length < size)
         size = c->content_length;
     }
 
 #if HTTP_USE_NTBTLS
   if (c->use_tls && c->session && c->session->tls_session)
     {
       estream_t in, out;
 
       ntbtls_get_stream (c->session->tls_session, &in, &out);
       nread = es_fread (buffer, 1, size, in);
       if (opt_debug)
         log_debug ("TLS network read: %d/%zu\n", nread, size);
     }
   else
 #elif HTTP_USE_GNUTLS
   if (c->use_tls && c->session && c->session->tls_session)
     {
     again:
       nread = gnutls_record_recv (c->session->tls_session, buffer, size);
       if (nread < 0)
         {
           if (nread == GNUTLS_E_INTERRUPTED)
             goto again;
           if (nread == GNUTLS_E_AGAIN)
             {
               struct timeval tv;
 
               tv.tv_sec = 0;
               tv.tv_usec = 50000;
               my_select (0, NULL, NULL, NULL, &tv);
               goto again;
             }
           if (nread == GNUTLS_E_REHANDSHAKE)
             goto again; /* A client is allowed to just ignore this request. */
           if (nread == GNUTLS_E_PREMATURE_TERMINATION)
             {
               /* The server terminated the connection.  Close the TLS
                  session, and indicate EOF using a short read.  */
               close_tls_session (c->session);
               return 0;
             }
           log_info ("TLS network read failed: %s\n", gnutls_strerror (nread));
           gpg_err_set_errno (EIO);
           return -1;
         }
     }
   else
 #endif /*HTTP_USE_GNUTLS*/
     {
       nread = read_server (c->sock->fd, buffer, size);
     }
 
   if (c->content_length_valid && nread > 0)
     {
       if (nread < c->content_length)
         c->content_length -= nread;
       else
         c->content_length = 0;
     }
 
   return (gpgrt_ssize_t)nread;
 }
 
 /* Write handler for estream.  */
 static gpgrt_ssize_t
 cookie_write (void *cookie, const void *buffer_arg, size_t size)
 {
   const char *buffer = buffer_arg;
   cookie_t c = cookie;
   int nwritten = 0;
 
 #if HTTP_USE_NTBTLS
   if (c->use_tls && c->session && c->session->tls_session)
     {
       estream_t in, out;
 
       ntbtls_get_stream (c->session->tls_session, &in, &out);
       if (size == 0)
         es_fflush (out);
       else
         nwritten = es_fwrite (buffer, 1, size, out);
       if (opt_debug)
         log_debug ("TLS network write: %d/%zu\n", nwritten, size);
     }
   else
 #elif HTTP_USE_GNUTLS
   if (c->use_tls && c->session && c->session->tls_session)
     {
       int nleft = size;
       while (nleft > 0)
         {
           nwritten = gnutls_record_send (c->session->tls_session,
                                          buffer, nleft);
           if (nwritten <= 0)
             {
               if (nwritten == GNUTLS_E_INTERRUPTED)
                 continue;
               if (nwritten == GNUTLS_E_AGAIN)
                 {
                   struct timeval tv;
 
                   tv.tv_sec = 0;
                   tv.tv_usec = 50000;
                   my_select (0, NULL, NULL, NULL, &tv);
                   continue;
                 }
               log_info ("TLS network write failed: %s\n",
                         gnutls_strerror (nwritten));
               gpg_err_set_errno (EIO);
               return -1;
             }
           nleft -= nwritten;
           buffer += nwritten;
         }
     }
   else
 #endif /*HTTP_USE_GNUTLS*/
     {
       if ( write_server (c->sock->fd, buffer, size) )
         {
           gpg_err_set_errno (EIO);
           nwritten = -1;
         }
       else
         nwritten = size;
     }
 
   return (gpgrt_ssize_t)nwritten;
 }
 
 
 #if defined(HAVE_W32_SYSTEM) && defined(HTTP_USE_NTBTLS)
 static gpgrt_ssize_t
 simple_cookie_read (void *cookie, void *buffer, size_t size)
 {
   assuan_fd_t sock = (assuan_fd_t)cookie;
   return read_server (sock, buffer, size);
 }
 
 static gpgrt_ssize_t
 simple_cookie_write (void *cookie, const void *buffer_arg, size_t size)
 {
   assuan_fd_t sock = (assuan_fd_t)cookie;
   const char *buffer = buffer_arg;
   int nwritten;
 
   if (write_server (sock, buffer, size))
     {
       gpg_err_set_errno (EIO);
       nwritten = -1;
     }
   else
     nwritten = size;
 
   return (gpgrt_ssize_t)nwritten;
 }
 #endif /*HAVE_W32_SYSTEM*/
 
 
 #ifdef HTTP_USE_GNUTLS
 /* Wrapper for gnutls_bye used by my_socket_unref.  */
 static void
 send_gnutls_bye (void *opaque)
 {
   tls_session_t tls_session = opaque;
   int ret;
 
  again:
   do
     ret = gnutls_bye (tls_session, GNUTLS_SHUT_RDWR);
   while (ret == GNUTLS_E_INTERRUPTED);
   if (ret == GNUTLS_E_AGAIN)
     {
       struct timeval tv;
 
       tv.tv_sec = 0;
       tv.tv_usec = 50000;
       my_select (0, NULL, NULL, NULL, &tv);
       goto again;
     }
 }
 #endif /*HTTP_USE_GNUTLS*/
 
 /* Close handler for estream.  */
 static int
 cookie_close (void *cookie)
 {
   cookie_t c = cookie;
 
   if (!c)
     return 0;
 
 #if HTTP_USE_NTBTLS
   if (c->use_tls && c->session && c->session->tls_session)
     {
       /* FIXME!! Possibly call ntbtls_close_notify for close
          of write stream.  */
       my_socket_unref (c->sock, NULL, NULL);
     }
   else
 #elif HTTP_USE_GNUTLS
   if (c->use_tls && c->session && c->session->tls_session)
     my_socket_unref (c->sock, send_gnutls_bye, c->session->tls_session);
   else
 #endif /*HTTP_USE_GNUTLS*/
     if (c->sock)
       my_socket_unref (c->sock, NULL, NULL);
 
   if (c->session)
     http_session_unref (c->session);
   xfree (c);
   return 0;
 }
 
 
 
 
 /* Verify the credentials of the server.  Returns 0 on success and
    store the result in the session object.  Only used by GNUTLS.  */
 gpg_error_t
 http_verify_server_credentials (http_session_t sess)
 {
 #if HTTP_USE_GNUTLS
   static const char errprefix[] = "TLS verification of peer failed";
   int rc;
   unsigned int status;
   const char *hostname;
   const gnutls_datum_t *certlist;
   unsigned int certlistlen;
   gnutls_x509_crt_t cert;
   gpg_error_t err = 0;
 
   sess->verify.done = 1;
   sess->verify.status = 0;
   sess->verify.rc = GNUTLS_E_CERTIFICATE_ERROR;
 
   if (gnutls_certificate_type_get (sess->tls_session) != GNUTLS_CRT_X509)
     {
       log_error ("%s: %s\n", errprefix, "not an X.509 certificate");
       sess->verify.rc = GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE;
       return gpg_error (GPG_ERR_GENERAL);
     }
 
   rc = gnutls_certificate_verify_peers2 (sess->tls_session, &status);
   if (rc)
     {
       log_error ("%s: %s\n", errprefix, gnutls_strerror (rc));
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
     }
   else if (status)
     {
       log_error ("%s: status=0x%04x\n", errprefix, status);
 #if GNUTLS_VERSION_NUMBER >= 0x030104
       {
         gnutls_datum_t statusdat;
 
         if (!gnutls_certificate_verification_status_print
             (status, GNUTLS_CRT_X509, &statusdat, 0))
           {
             log_info ("%s: %s\n", errprefix, statusdat.data);
             gnutls_free (statusdat.data);
           }
       }
 #endif /*gnutls >= 3.1.4*/
 
       sess->verify.status = status;
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
     }
 
   hostname = sess->servername;
   if (!hostname || !strchr (hostname, '.'))
     {
       log_error ("%s: %s\n", errprefix, "hostname missing");
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
     }
 
   certlist = gnutls_certificate_get_peers (sess->tls_session, &certlistlen);
   if (!certlistlen)
     {
       log_error ("%s: %s\n", errprefix, "server did not send a certificate");
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
 
       /* Need to stop here.  */
       if (err)
         return err;
     }
 
   rc = gnutls_x509_crt_init (&cert);
   if (rc < 0)
     {
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
       if (err)
         return err;
     }
 
   rc = gnutls_x509_crt_import (cert, &certlist[0], GNUTLS_X509_FMT_DER);
   if (rc < 0)
     {
       log_error ("%s: %s: %s\n", errprefix, "error importing certificate",
                  gnutls_strerror (rc));
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
     }
 
   if (!gnutls_x509_crt_check_hostname (cert, hostname))
     {
       log_error ("%s: %s\n", errprefix, "hostname does not match");
       if (!err)
         err = gpg_error (GPG_ERR_GENERAL);
     }
 
   gnutls_x509_crt_deinit (cert);
 
   if (!err)
     sess->verify.rc = 0;
 
   if (sess->cert_log_cb)
     {
       const void *bufarr[10];
       size_t buflenarr[10];
       size_t n;
 
       for (n = 0; n < certlistlen && n < DIM (bufarr)-1; n++)
         {
           bufarr[n] = certlist[n].data;
           buflenarr[n] = certlist[n].size;
         }
       bufarr[n] = NULL;
       buflenarr[n] = 0;
       sess->cert_log_cb (sess, err, hostname, bufarr, buflenarr);
     }
 
   return err;
 #else /*!HTTP_USE_GNUTLS*/
   (void)sess;
   return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
 #endif
 }
 
 /* Return the first query variable with the specified key.  If there
    is no such variable, return NULL.  */
 struct uri_tuple_s *
 uri_query_lookup (parsed_uri_t uri, const char *key)
 {
   struct uri_tuple_s *t;
 
   for (t = uri->query; t; t = t->next)
     if (strcmp (t->name, key) == 0)
       return t;
 
   return NULL;
 }
 
 const char *
 uri_query_value (parsed_uri_t url, const char *key)
 {
   struct uri_tuple_s *t;
   t = uri_query_lookup (url, key);
   return t? t->value : NULL;
 }
 
 
 
 /* Return true if both URI point to the same host for the purpose of
  * redirection check.  A is the original host and B the host given in
  * the Location header.  As a temporary workaround a fixed list of
  * exceptions is also consulted.  */
 static int
 same_host_p (parsed_uri_t a, parsed_uri_t b)
 {
   static struct
   {
     const char *from;  /* NULL uses the last entry from the table.  */
     const char *to;
   } allow[] =
   {
     { "protonmail.com", "api.protonmail.com" },
     { NULL,             "api.protonmail.ch"  },
     { "protonmail.ch",  "api.protonmail.com" },
     { NULL,             "api.protonmail.ch"  },
     { "pm.me",          "api.protonmail.ch"  }
   };
   static const char *subdomains[] =
     {
       "openpgpkey."
     };
   int i;
   const char *from;
 
   if (!a->host || !b->host)
     return 0;
 
   if (!ascii_strcasecmp (a->host, b->host))
     return 1;
 
   from = NULL;
   for (i=0; i < DIM (allow); i++)
     {
       if (allow[i].from)
         from = allow[i].from;
       if (!from)
         continue;
       if (!ascii_strcasecmp (from, a->host)
           && !ascii_strcasecmp (allow[i].to, b->host))
         return 1;
     }
 
   /* Also consider hosts the same if they differ only in a subdomain;
    * in both direction.  This allows to have redirection between the
    * WKD advanced and direct lookup methods. */
   for (i=0; i < DIM (subdomains); i++)
     {
       const char *subdom = subdomains[i];
       size_t subdomlen = strlen (subdom);
 
       if (!ascii_strncasecmp (a->host, subdom, subdomlen)
           && !ascii_strcasecmp (a->host + subdomlen, b->host))
         return 1;
       if (!ascii_strncasecmp (b->host, subdom, subdomlen)
           && !ascii_strcasecmp (b->host + subdomlen, a->host))
         return 1;
     }
 
   return 0;
 }
 
 
 /* Prepare a new URL for a HTTP redirect.  INFO has flags controlling
  * the operation, STATUS_CODE is used for diagnostics, LOCATION is the
  * value of the "Location" header, and R_URL reveives the new URL on
  * success or NULL or error.  Note that INFO->ORIG_URL is
  * required.  */
 gpg_error_t
 http_prepare_redirect (http_redir_info_t *info, unsigned int status_code,
                        const char *location, char **r_url)
 {
   gpg_error_t err;
   parsed_uri_t locuri;
   parsed_uri_t origuri;
   char *newurl;
   char *p;
 
   *r_url = NULL;
 
   if (!info || !info->orig_url)
     return gpg_error (GPG_ERR_INV_ARG);
 
   if (!info->silent)
     log_info (_("URL '%s' redirected to '%s' (%u)\n"),
               info->orig_url, location? location:"[none]", status_code);
 
   if (!info->redirects_left)
     {
       if (!info->silent)
         log_error (_("too many redirections\n"));
       return gpg_error (GPG_ERR_NO_DATA);
     }
   info->redirects_left--;
 
   if (!location || !*location)
     return gpg_error (GPG_ERR_NO_DATA);
 
   err = http_parse_uri (&locuri, location, 0);
   if (err)
     return err;
 
   /* Make sure that an onion address only redirects to another
    * onion address, or that a https address only redirects to a
    * https address. */
   if (info->orig_onion && !locuri->onion)
     {
       dirmngr_status_printf (info->ctrl, "WARNING",
                              "http_redirect %u"
                              " redirect from onion to non-onion address"
                              " rejected",
                              err);
       http_release_parsed_uri (locuri);
       return gpg_error (GPG_ERR_FORBIDDEN);
     }
   if (!info->allow_downgrade && info->orig_https && !locuri->use_tls)
     {
       err = gpg_error (GPG_ERR_FORBIDDEN);
       dirmngr_status_printf (info->ctrl, "WARNING",
                              "http_redirect %u"
                              " redirect '%s' to '%s' rejected",
                              err, info->orig_url, location);
       http_release_parsed_uri (locuri);
       return err;
     }
 
   if (info->trust_location)
     {
       /* We trust the Location - return it verbatim.  */
       http_release_parsed_uri (locuri);
       newurl = xtrystrdup (location);
       if (!newurl)
         {
           err = gpg_error_from_syserror ();
           http_release_parsed_uri (locuri);
           return err;
         }
     }
   else if ((err = http_parse_uri (&origuri, info->orig_url, 0)))
     {
       http_release_parsed_uri (locuri);
       return err;
     }
   else if (same_host_p (origuri, locuri))
     {
       /* The host is the same or on an exception list and thus we can
        * take the location verbatim.  */
       http_release_parsed_uri (origuri);
       http_release_parsed_uri (locuri);
       newurl = xtrystrdup (location);
       if (!newurl)
         {
           err = gpg_error_from_syserror ();
           http_release_parsed_uri (locuri);
           return err;
         }
     }
   else
     {
       /* We take only the host and port from the URL given in the
        * Location.  This limits the effects of redirection attacks by
        * rogue hosts returning an URL to servers in the client's own
        * network.  We don't even include the userinfo because they
        * should be considered similar to the path and query parts.
        */
       if (!(locuri->off_path - locuri->off_host))
         {
           http_release_parsed_uri (origuri);
           http_release_parsed_uri (locuri);
           return gpg_error (GPG_ERR_BAD_URI);
         }
       if (!(origuri->off_path - origuri->off_host))
         {
           http_release_parsed_uri (origuri);
           http_release_parsed_uri (locuri);
           return gpg_error (GPG_ERR_BAD_URI);
         }
 
       newurl = xtrymalloc (strlen (origuri->original)
                            + (locuri->off_path - locuri->off_host) + 1);
       if (!newurl)
         {
           err = gpg_error_from_syserror ();
           http_release_parsed_uri (origuri);
           http_release_parsed_uri (locuri);
           return err;
         }
       /* Build new URL from
        *   uriguri:  scheme userinfo ---- ---- path rest
        *   locuri:   ------ -------- host port ---- ----
        */
       p = newurl;
       memcpy (p, origuri->original, origuri->off_host);
       p += origuri->off_host;
       memcpy (p, locuri->original + locuri->off_host,
               (locuri->off_path - locuri->off_host));
       p += locuri->off_path - locuri->off_host;
       strcpy (p, origuri->original + origuri->off_path);
 
       http_release_parsed_uri (origuri);
       http_release_parsed_uri (locuri);
       if (!info->silent)
         log_info (_("redirection changed to '%s'\n"), newurl);
       dirmngr_status_printf (info->ctrl, "WARNING",
                              "http_redirect_cleanup %u"
                              " changed from '%s' to '%s'",
                              0, info->orig_url, newurl);
     }
 
   *r_url = newurl;
   return 0;
 }
 
 
 /* Return string describing the http STATUS.  Returns an empty string
  * for an unknown status.  */
 const char *
 http_status2string (unsigned int status)
 {
   switch (status)
     {
     case 500: return "Internal Server Error";
     case 501: return "Not Implemented";
     case 502: return "Bad Gateway";
     case 503: return "Service Unavailable";
     case 504: return "Gateway Timeout";
     case 505: return "HTTP version Not Supported";
     case 506: return "Variant Also Negation";
     case 507: return "Insufficient Storage";
     case 508: return "Loop Detected";
     case 510: return "Not Extended";
     case 511: return "Network Authentication Required";
     }
 
   return "";
 }
+
+
+/* Fucntion called on SIGHUP to flush internal variables.  */
+void
+http_reinitialize (void)
+{
+#ifdef HAVE_W32_SYSTEM
+  w32_get_internet_session (1);  /* Clear our session.  */
+#endif /*HAVE_W32_SYSTEM*/
+}
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index 7cb670689..f988fe2e5 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -1,1291 +1,1293 @@
 @c Copyright (C) 2002 Klar"alvdalens Datakonsult AB
 @c Copyright (C) 2004, 2005, 2006, 2007 g10 Code GmbH
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
 @include defs.inc
 
 @node Invoking DIRMNGR
 @chapter Invoking DIRMNGR
 @cindex DIRMNGR command options
 @cindex command options
 @cindex options, DIRMNGR command
 
 @manpage dirmngr.8
 @ifset manverb
 .B dirmngr
 \- GnuPG's network access daemon
 @end ifset
 
 @mansect synopsis
 @ifset manverb
 .B  dirmngr
 .RI [ options ]
 .I command
 .RI [ args ]
 @end ifset
 
 @mansect description
 Since version 2.1 of GnuPG, @command{dirmngr} takes care of accessing
 the OpenPGP keyservers.  As with previous versions it is also used as
 a server for managing and downloading certificate revocation lists
 (CRLs) for X.509 certificates, downloading X.509 certificates, and
 providing access to OCSP providers.  Dirmngr is invoked internally by
 @command{gpg}, @command{gpgsm}, or via the @command{gpg-connect-agent}
 tool.
 
 @manpause
 @noindent
 @xref{Option Index},for an index to @command{DIRMNGR}'s commands and
 options.
 @mancont
 
 @menu
 * Dirmngr Commands::      List of all commands.
 * Dirmngr Options::       List of all options.
 * Dirmngr Configuration:: Configuration files.
 * Dirmngr Signals::       Use of signals.
 * Dirmngr Examples::      Some usage examples.
 * Dirmngr Protocol::      The protocol dirmngr uses.
 @end menu
 
 
 @node Dirmngr Commands
 @section Commands
 @mansect commands
 
 Commands are not distinguished from options except for the fact that
 only one command is allowed.
 
 @table @gnupgtabopt
 @item --version
 @opindex version
 Print the program version and licensing information.  Note that you cannot
 abbreviate this command.
 
 @item --help, -h
 @opindex help
 Print a usage message summarizing the most useful command-line options.
 Note that you cannot abbreviate this command.
 
 @item --dump-options
 @opindex dump-options
 Print a list of all available options and commands.  Note that you cannot
 abbreviate this command.
 
 @item --server
 @opindex server
 Run in server mode and wait for commands on the @code{stdin}.  The
 default mode is to create a socket and listen for commands there.
 This is only used for testing.
 
 @item --daemon
 @opindex daemon
 Run in background daemon mode and listen for commands on a socket.
 This is the way @command{dirmngr} is started on demand by the other
 GnuPG components.  To force starting @command{dirmngr} it is in
 general best to use @code{gpgconf --launch dirmngr}.
 
 @item --supervised
 @opindex supervised
 Run in the foreground, sending logs to stderr, and listening on file
 descriptor 3, which must already be bound to a listening socket.  This
 is useful when running under systemd or other similar process
 supervision schemes.  This option is not supported on Windows.
 
 @item --list-crls
 @opindex list-crls
 List the contents of the CRL cache on @code{stdout}. This is probably
 only useful for debugging purposes.
 
 @item --load-crl @var{file}
 @opindex load-crl
 This command requires a filename as additional argument, and it will
 make Dirmngr try to import the CRL in @var{file} into it's cache.
 Note, that this is only possible if Dirmngr is able to retrieve the
 CA's certificate directly by its own means.  In general it is better
 to use @code{gpgsm}'s @code{--call-dirmngr loadcrl filename} command
 so that @code{gpgsm} can help dirmngr.
 
 @item --fetch-crl @var{url}
 @opindex fetch-crl
 This command requires an URL as additional argument, and it will make
 dirmngr try to retrieve and import the CRL from that @var{url} into
 it's cache.  This is mainly useful for debugging purposes.  The
 @command{dirmngr-client} provides the same feature for a running dirmngr.
 
 @item --shutdown
 @opindex shutdown
 This commands shuts down an running instance of Dirmngr.  This command
 has currently no effect.
 
 @item --flush
 @opindex flush
 This command removes all CRLs from Dirmngr's cache.  Client requests
 will thus trigger reading of fresh CRLs.
 
 @end table
 
 
 @mansect options
 @node Dirmngr Options
 @section Option Summary
 
 Note that all long options with the exception of @option{--options}
 and @option{--homedir} may also be given in the configuration file
 after stripping off the two leading dashes.
 
 @table @gnupgtabopt
 
 @item --options @var{file}
 @opindex options
 Reads configuration from @var{file} instead of from the default
 per-user configuration file.  The default configuration file is named
 @file{dirmngr.conf} and expected in the home directory.
 
 @item --homedir @var{dir}
 @opindex options
 Set the name of the home directory to @var{dir}.  This option is only
 effective when used on the command line.  The default is
 the directory named @file{.gnupg} directly below the home directory
 of the user unless the environment variable @code{GNUPGHOME} has been set
 in which case its value will be used.  Many kinds of data are stored within
 this directory.
 
 
 @item -v
 @item --verbose
 @opindex v
 @opindex verbose
 Outputs additional information while running.
 You can increase the verbosity by giving several
 verbose commands to @sc{dirmngr}, such as @option{-vv}.
 
 
 @item --log-file @var{file}
 @opindex log-file
 Append all logging output to @var{file}.  This is very helpful in
 seeing what the agent actually does.  Use @file{socket://} to log to
 socket.
 
 @item --compatibility-flags @var{flags}
 @opindex compatibility-flags
 Set compatibility flags to work around certain problems or to emulate
 bugs.  The @var{flags} are given as a comma separated list of flag
 names and are OR-ed together.  The special flag "none" clears the list
 and allows to start over with an empty list.  To get a list of
 available flags the sole word "help" can be used.
 
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems.  @var{level} may be a
 numeric value or by a keyword:
 
 @table @code
 @item none
 No debugging at all.  A value of less than 1 may be used instead of
 the keyword.
 @item basic
 Some basic debug messages.  A value between 1 and 2 may be used
 instead of the keyword.
 @item advanced
 More verbose debug messages.  A value between 3 and 5 may be used
 instead of the keyword.
 @item expert
 Even more detailed messages.  A value between 6 and 8 may be used
 instead of the keyword.
 @item guru
 All of the debug messages you can get. A value greater than 8 may be
 used instead of the keyword.  The creation of hash tracing files is
 only enabled if the keyword is used.
 @end table
 
 How these messages are mapped to the actual debugging flags is not
 specified and may change with newer releases of this program. They are
 however carefully selected to best aid in debugging.
 
 @item --debug @var{flags}
 @opindex debug
 Set debugging flags.  This option is only useful for debugging and its
 behavior may change with a new release.  All flags are or-ed and may
 be given in C syntax (e.g. 0x0042) or as a comma separated list of
 flag names.  To get a list of all supported flags the single word
 "help" can be used.
 
 @item --debug-all
 @opindex debug-all
 Same as @code{--debug=0xffffffff}
 
 @item --tls-debug @var{level}
 @opindex tls-debug
 Enable debugging of the TLS layer at @var{level}.  The details of the
 debug level depend on the used TLS library and are not set in stone.
 
 @item --debug-wait @var{n}
 @opindex debug-wait
 When running in server mode, wait @var{n} seconds before entering the
 actual processing loop and print the pid.  This gives time to attach a
 debugger.
 
 @item --disable-check-own-socket
 @opindex disable-check-own-socket
 On some platforms @command{dirmngr} is able to detect the removal of
 its socket file and shutdown itself.  This option disable this
 self-test for debugging purposes.
 
 @item -s
 @itemx --sh
 @itemx -c
 @itemx --csh
 @opindex s
 @opindex sh
 @opindex c
 @opindex csh
 Format the info output in daemon mode for use with the standard Bourne
 shell respective the C-shell. The default is to guess it based on the
 environment variable @code{SHELL} which is in almost all cases
 sufficient.
 
 @item --force
 @opindex force
 Enabling this option forces loading of expired CRLs; this is only
 useful for debugging.
 
 @item --use-tor
 @itemx --no-use-tor
 @opindex use-tor
 @opindex no-use-tor
 The option @option{--use-tor} switches Dirmngr and thus GnuPG into
 ``Tor mode'' to route all network access via Tor (an anonymity
 network).  Certain other features are disabled in this mode.  The
 effect of @option{--use-tor} cannot be overridden by any other command
 or even by reloading dirmngr.  The use of @option{--no-use-tor}
 disables the use of Tor.  The default is to use Tor if it is available
 on startup or after reloading dirmngr.  The test on the available of
 Tor is done by trying to connects to a SOCKS proxy at either port 9050
 or 9150); if another type of proxy is listening on one of these ports,
 you should use @option{--no-use-tor}.
 
 @item --standard-resolver
 @opindex standard-resolver
 This option forces the use of the system's standard DNS resolver code.
 This is mainly used for debugging.  Note that on Windows a standard
 resolver is not used and all DNS access will return the error ``Not
 Implemented'' if this option is used.  Using this together with enabled
 Tor mode returns the error ``Not Enabled''.
 
 @item --recursive-resolver
 @opindex recursive-resolver
 When possible use a recursive resolver instead of a stub resolver.
 
 @item --resolver-timeout @var{n}
 @opindex resolver-timeout
 Set the timeout for the DNS resolver to N seconds.  The default are 30
 seconds.
 
 @item --connect-timeout @var{n}
 @item --connect-quick-timeout @var{n}
 @opindex connect-timeout
 @opindex connect-quick-timeout
 Set the timeout for HTTP and generic TCP connection attempts to N
 seconds.  The value set with the quick variant is used when the
 --quick option has been given to certain Assuan commands.  The quick
 value is capped at the value of the regular connect timeout.  The
 default values are 15 and 2 seconds.  Note that the timeout values are
 for each connection attempt; the connection code will attempt to
 connect all addresses listed for a server.
 
 @item --listen-backlog @var{n}
 @opindex listen-backlog
 Set the size of the queue for pending connections.  The default is 64.
 
 @item --allow-version-check
 @opindex allow-version-check
 Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
 the list of current software versions.  If this option is enabled
 the list is retrieved in case the local
 copy does not exist or is older than 5 to 7 days.  See the option
 @option{--query-swdb} of the command @command{gpgconf} for more
 details.  Note, that regardless of this option a version check can
 always be triggered using this command:
 
 @example
        gpg-connect-agent --dirmngr 'loadswdb --force' /bye
 @end example
 
 
 @item --keyserver @var{name}
 @opindex keyserver
 Use @var{name} as your keyserver.  This is the server that @command{gpg}
 communicates with to receive keys, send keys, and search for
 keys.  The format of the @var{name} is a URI:
 `scheme:[//]keyservername[:port]' The scheme is the type of keyserver:
 "hkp" for the HTTP (or compatible) keyservers, "ldap" for the LDAP
 keyservers, or "mailto" for the Graff email keyserver. Note that your
 particular installation of GnuPG may have other keyserver types
 available as well. Keyserver schemes are case-insensitive. After the
 keyserver name, optional keyserver configuration options may be
 provided.  These are the same as the @option{--keyserver-options} of
 @command{gpg}, but apply only to this particular keyserver.
 
 Some keyservers synchronize with each other, so there is not always a
 need to send keys to more than one server. Some keyservers use round
 robin DNS to give a different keyserver each time you use it.
 
 If exactly two keyservers are configured and only one is a Tor hidden
 service (.onion), Dirmngr selects the keyserver to use depending on
 whether Tor is locally running or not.  The check for a running Tor is
 done for each new connection.
 
 If no keyserver is explicitly configured, dirmngr will use the
 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
 may use the short form @code{ldap:///} for @var{name} to access this directory.
 
 For accessing anonymous LDAP keyservers @var{name} is in general just
 a @code{ldaps://ldap.example.com}.  A BaseDN parameter should never be
 specified.  If authentication is required things are more complicated
 and two methods are available:
 
 The modern method (since version 2.2.28) is to use the very same syntax
 as used with the option @option{--ldapserver}.  Please see over
 there for details; here is an example:
 
 @example
        keyserver ldap:ldap.example.com::uid=USERNAME,ou=GnuPG Users,
        dc=example,dc=com:PASSWORD::starttls
 @end example
 
        The other method is to use a full URL for @var{name}; for example:
 
 @example
        keyserver ldaps://ldap.example.com/????bindname=uid=USERNAME
        %2Cou=GnuPG%20Users%2Cdc=example%2Cdc=com,password=PASSWORD
 @end example
 
        Put this all on one line without any spaces and keep the '%2C'
        as given.  Replace USERNAME, PASSWORD, and the 'dc' parts
        according to the instructions received from your LDAP
        administrator.  Note that only simple authentication
        (i.e. cleartext passwords) is supported and thus using ldaps is
        strongly suggested (since 2.2.28 "ldaps" defaults to port 389
        and uses STARTTLS).  On Windows authentication via AD can be
        requested by adding @code{gpgNtds=1} after the fourth question
        mark instead of the bindname and password parameter.
 
 
 
 @item --nameserver @var{ipaddr}
 @opindex nameserver
 In ``Tor mode'' Dirmngr uses a public resolver via Tor to resolve DNS
 names.  If the default public resolver, which is @code{8.8.8.8}, shall
 not be used a different one can be given using this option.  Note that
 a numerical IP address must be given (IPv6 or IPv4) and that no error
 checking is done for @var{ipaddr}.
 
 @item --disable-ipv4
 @item --disable-ipv6
 @opindex disable-ipv4
 @opindex disable-ipv6
 Disable the use of all IPv4 or IPv6 addresses.
 
 @item --disable-ldap
 @opindex disable-ldap
 Entirely disables the use of LDAP.
 
 @item --disable-http
 @opindex disable-http
 Entirely disables the use of HTTP.
 
 @item --ignore-http-dp
 @opindex ignore-http-dp
 When looking for the location of a CRL, the to be tested certificate
 usually contains so called @dfn{CRL Distribution Point} (DP) entries
 which are URLs describing the way to access the CRL.  The first found DP
 entry is used.  With this option all entries using the @acronym{HTTP}
 scheme are ignored when looking for a suitable DP.
 
 @item --ignore-ldap-dp
 @opindex ignore-ldap-dp
 This is similar to @option{--ignore-http-dp} but ignores entries using
 the @acronym{LDAP} scheme.  Both options may be combined resulting in
 ignoring DPs entirely.
 
 @item --ignore-ocsp-service-url
 @opindex ignore-ocsp-service-url
 Ignore all OCSP URLs contained in the certificate.  The effect is to
 force the use of the default responder.
 
 @item --honor-http-proxy
 @opindex honor-http-proxy
 If the environment variable @env{http_proxy} has been set, use its
-value to access HTTP servers.
+value to access HTTP servers.  If on Windows the option is used but
+the environment variable is not set, the proxy settings are taken
+from the system.
 
 @item --http-proxy [http://]@var{host}[:@var{port}]
 @opindex http-proxy
 @efindex http_proxy
 Use @var{host} and @var{port} to access HTTP servers.  The use of this
 option overrides the environment variable @env{http_proxy} regardless
 whether @option{--honor-http-proxy} has been set.
 
 
 @item --ldap-proxy @var{host}[:@var{port}]
 @opindex ldap-proxy
 Use @var{host} and @var{port} to connect to LDAP servers.  If @var{port}
 is omitted, port 389 (standard LDAP port) is used.  This overrides any
 specified host and port part in a LDAP URL and will also be used if host
 and port have been omitted from the URL.
 
 @item --only-ldap-proxy
 @opindex only-ldap-proxy
 Never use anything else but the LDAP "proxy" as configured with
 @option{--ldap-proxy}.  Usually @command{dirmngr} tries to use other
 configured LDAP server if the connection using the "proxy" failed.
 
 
 @item --ldapserverlist-file @var{file}
 @opindex ldapserverlist-file
 Read the list of LDAP servers to consult for CRLs and X.509 certificates from
 file instead of the default per-user ldap server list file. The default
 value for @var{file} is @file{dirmngr_ldapservers.conf}.
 
 This server list file contains one LDAP server per line in the format
 
 @sc{hostname:port:username:password:base_dn:flags}
 
 Lines starting with a  @samp{#} are comments.
 
 Note that as usual all strings entered are expected to be UTF-8 encoded.
 Obviously this will lead to problems if the password has originally been
 encoded as Latin-1.  There is no other solution here than to put such a
 password in the binary encoding into the file (i.e. non-ascii characters
 won't show up readable).@footnote{The @command{gpgconf} tool might be
 helpful for frontends as it enables editing this configuration file using
 percent-escaped strings.}
 
 
 @item --ldapserver @var{spec}
 @opindex ldapserver
 This is an alternative way to specify LDAP servers for CRL and X.509
 certificate retrieval.  If this option is used the servers configured
 in @file{dirmngr_ldapservers.conf} (or the file given by
 @option{--ldapserverlist-file}) are cleared.  Note that
 @file{dirmngr_ldapservers.conf} is not read again by a reload
 signal. However, @option{--ldapserver} options are read again.
 
 @var{spec} is either a proper LDAP URL or a colon delimited list of
 the form
 
 @sc{hostname:port:username:password:base_dn:flags:}
 
 with an optional prefix of @code{ldap:} (but without the two slashes
 which would turn this into a proper LDAP URL).  @sc{flags} is a list
 of one or more comma delimited keywords:
 @table @code
 @item plain
 The default: Do not use a TLS secured connection at all; the default
 port is 389.
 @item starttls
 Use STARTTLS to secure the connection; the default port is 389.
 @item ldaptls
 Tunnel LDAP through a TLS connection; the default port is 636.
 @item ntds
 On Windows authenticate the LDAP connection using the Active Directory
 with the current user.
 @item areconly
 On Windows use only the A or AAAA record when resolving the LDAP
 server name.
 @end table
 
 Note that in an URL style specification the scheme @code{ldaps://}
 refers to STARTTLS and _not_ to LDAP-over-TLS.
 
 
 @item --ldaptimeout @var{secs}
 @opindex ldaptimeout
 Specify the number of seconds to wait for an LDAP query before timing
 out.  The default are 15 seconds.  0 will never timeout.
 
 
 @item --add-servers
 @opindex add-servers
 This option makes dirmngr add any servers it discovers when validating
 certificates against CRLs to the internal list of servers to consult for
 certificates and CRLs.
 
 This option is useful when trying to validate a certificate that has
 a CRL distribution point that points to a server that is not already
 listed in the ldapserverlist. Dirmngr will always go to this server and
 try to download the CRL, but chances are high that the certificate used
 to sign the CRL is located on the same server. So if dirmngr doesn't add
 that new server to list, it will often not be able to verify the
 signature of the CRL unless the @code{--add-servers} option is used.
 
 Note: The current version of dirmngr has this option disabled by default.
 
 
 @item --allow-ocsp
 @opindex allow-ocsp
 This option enables OCSP support if requested by the client.
 
 OCSP requests are rejected by default because they may violate the
 privacy of the user; for example it is possible to track the time when
 a user is reading a mail.
 
 
 @item --ocsp-responder @var{url}
 @opindex ocsp-responder
 Use @var{url} as the default OCSP Responder if the certificate does
 not contain information about an assigned responder.  Note, that
 @code{--ocsp-signer} must also be set to a valid certificate.
 
 @item --ocsp-signer @var{fpr}|@var{file}
 @opindex ocsp-signer
 Use the certificate with the fingerprint @var{fpr} to check the
 responses of the default OCSP Responder.  Alternatively a filename can be
 given in which case the response is expected to be signed by one of the
 certificates described in that file.  Any argument which contains a
 slash, dot or tilde is considered a filename.  Usual filename expansion
 takes place: A tilde at the start followed by a slash is replaced by the
 content of @env{HOME}, no slash at start describes a relative filename
 which will be searched at the home directory.  To make sure that the
 @var{file} is searched in the home directory, either prepend the name
 with "./" or use a name which contains a dot.
 
 If a response has been signed by a certificate described by these
 fingerprints no further check upon the validity of this certificate is
 done.
 
 The format of the @var{FILE} is a list of SHA-1 fingerprint, one per
 line with optional colons between the bytes.  Empty lines and lines
 prefix with a hash mark are ignored.
 
 
 @item --ocsp-max-clock-skew @var{n}
 @opindex ocsp-max-clock-skew
 The number of seconds a skew between the OCSP responder and them local
 clock is accepted.  Default is 600 (10 minutes).
 
 @item --ocsp-max-period @var{n}
 @opindex ocsp-max-period
 Seconds a response is at maximum considered valid after the time given
 in the thisUpdate field.  Default is 7776000 (90 days).
 
 @item --ocsp-current-period @var{n}
 @opindex ocsp-current-period
 The number of seconds an OCSP response is considered valid after the
 time given in the NEXT_UPDATE datum.  Default is 10800 (3 hours).
 
 
 @item --max-replies @var{n}
 @opindex max-replies
 Do not return more that @var{n} items in one query.  The default is
 10.
 
 @item --ignore-cert-extension @var{oid}
 @opindex ignore-cert-extension
 Add @var{oid} to the list of ignored certificate extensions.  The
 @var{oid} is expected to be in dotted decimal form, like
 @code{2.5.29.3}.  This option may be used more than once.  Critical
 flagged certificate extensions matching one of the OIDs in the list
 are treated as if they are actually handled and thus the certificate
 won't be rejected due to an unknown critical extension.  Use this
 option with care because extensions are usually flagged as critical
 for a reason.
 
 @item --ignore-crl-extension @var{oid}
 @opindex ignore-crl-extension
 Add @var{oid} to the list of ignored CRL extensions.  The @var{oid} is
 expected to be in dotted decimal form.  Critical flagged CRL
 extensions matching one of the OIDs in the list are treated as if they
 are actually handled and thus the certificate won't be rejected due to
 an unknown critical extension.  Use this option with care because
 extensions are usually flagged as critical for a reason.
 
 @item --ignore-cert @var{fpr}|@var{file}
 @opindex ignore-cert
 Entirely ignore certificates with the fingerprint @var{fpr}.  As an
 alternative to the fingerprint a filename can be given in which case
 all certificates described in that file are ignored.  Any argument
 which contains a slash, dot or tilde is considered a filename.  Usual
 filename expansion takes place: A tilde at the start followed by a
 slash is replaced by the content of @env{HOME}, no slash at start
 describes a relative filename which will be searched at the home
 directory.  To make sure that the @var{file} is searched in the home
 directory, either prepend the name with "./" or use a name which
 contains a dot.  The format of such a file is a list of SHA-1
 fingerprint, one per line with optional colons between the bytes.
 Empty lines and lines prefixed with a hash mark are ignored.
 
 This option is useful as a quick workaround to exclude certain
 certificates from the system store.
 
 
 @item --hkp-cacert @var{file}
 Use the root certificates in @var{file} for verification of the TLS
 certificates used with @code{hkps} (keyserver access over TLS).  If
 the file is in PEM format a suffix of @code{.pem} is expected for
 @var{file}.  This option may be given multiple times to add more
 root certificates.  Tilde expansion is supported.
 
 If no @code{hkp-cacert} directive is present, dirmngr will use the
 system CAs.
 
 @end table
 
 
 @c
 @c Dirmngr Configuration
 @c
 @mansect files
 @node Dirmngr Configuration
 @section Configuration
 
 Dirmngr makes use of several directories when running in daemon mode:
 There are a few configuration files whih control the operation of
 dirmngr.  By default they may all be found in the current home
 directory (@pxref{option --homedir}).
 
 @table @file
 
 @item dirmngr.conf
 @efindex dirmngr.conf
 This is the standard configuration file read by @command{dirmngr} on
 startup.  It may contain any valid long option; the leading two dashes
 may not be entered and the option may not be abbreviated.  This file
 is also read after a @code{SIGHUP} however not all options will
 actually have an effect.  This default name may be changed on the
 command line (@pxref{option --options}).  You should backup this file.
 
 @item /etc/gnupg/trusted-certs
 This directory should be filled with certificates of Root CAs you
 are trusting in checking the CRLs and signing OCSP Responses.
 
 Usually these are the same certificates you use with the applications
 making use of dirmngr.  It is expected that each of these certificate
 files contain exactly one @acronym{DER} encoded certificate in a file
 with the suffix @file{.crt} or @file{.der}.  @command{dirmngr} reads
 those certificates on startup and when given a SIGHUP.  Certificates
 which are not readable or do not make up a proper X.509 certificate
 are ignored; see the log file for details.
 
 Applications using dirmngr (e.g. gpgsm) can request these
 certificates to complete a trust chain in the same way as with the
 extra-certs directory (see below).
 
 Note that for OCSP responses the certificate specified using the option
 @option{--ocsp-signer} is always considered valid to sign OCSP requests.
 
 @item /etc/gnupg/extra-certs
 This directory may contain extra certificates which are preloaded
 into the internal cache on startup. Applications using dirmngr (e.g. gpgsm)
 can request cached certificates to complete a trust chain.
 This is convenient in cases you have a couple intermediate CA certificates
 or certificates usually used to sign OCSP responses.
 These certificates are first tried before going
 out to the net to look for them.  These certificates must also be
 @acronym{DER} encoded and suffixed with @file{.crt} or @file{.der}.
 
 @item ~/.gnupg/crls.d
 This directory is used to store cached CRLs.  The @file{crls.d}
 part will be created by dirmngr if it does not exists but you need to
 make sure that the upper directory exists.
 
 @end table
 @manpause
 
 To be able to see what's going on you should create the configure file
 @file{~/gnupg/dirmngr.conf} with at least one line:
 
 @example
 log-file ~/dirmngr.log
 @end example
 
 To be able to perform OCSP requests you probably want to add the line:
 
 @example
 allow-ocsp
 @end example
 
 To make sure that new options are read and that after the installation
 of a new GnuPG versions the installed dirmngr is running, you may want
 to kill an existing dirmngr first:
 
 @example
 gpgconf --kill dirmngr
 @end example
 
 You may check the log file to see whether all desired root
 certificates have been loaded correctly.
 
 
 @c
 @c Dirmngr Signals
 @c
 @mansect signals
 @node Dirmngr Signals
 @section Use of signals
 
 A running @command{dirmngr} may be controlled by signals, i.e. using
 the @command{kill} command to send a signal to the process.
 
 Here is a list of supported signals:
 
 @table @gnupgtabopt
 
 @item SIGHUP
 @cpindex SIGHUP
 This signal flushes all internally cached CRLs as well as any cached
 certificates.  Then the certificate cache is reinitialized as on
 startup.  Options are re-read from the configuration file.  Instead of
 sending this signal it is better to use
 @example
 gpgconf --reload dirmngr
 @end example
 
 @item SIGTERM
 @cpindex SIGTERM
 Shuts down the process but waits until all current requests are
 fulfilled.  If the process has received 3 of these signals and requests
 are still pending, a shutdown is forced.  You may also use
 @example
 gpgconf --kill dirmngr
 @end example
 instead of this signal
 
 @item SIGINT
 @cpindex SIGINT
 Shuts down the process immediately.
 
 
 @item SIGUSR1
 @cpindex SIGUSR1
 This prints some caching statistics to the log file.
 
 @end table
 
 
 
 @c
 @c  Examples
 @c
 @mansect examples
 @node Dirmngr Examples
 @section Examples
 
 Here is an example on how to show dirmngr's internal table of OpenPGP
 keyserver addresses.  The output is intended for debugging purposes
 and not part of a defined API.
 
 @example
   gpg-connect-agent --dirmngr 'keyserver --hosttable' /bye
 @end example
 
 To inhibit the use of a particular host you have noticed in one of the
 keyserver pools, you may use
 
 @example
  gpg-connect-agent --dirmngr 'keyserver --dead pgpkeys.bnd.de' /bye
 @end example
 
 The description of the @code{keyserver} command can be printed using
 
 @example
  gpg-connect-agent --dirmngr 'help keyserver' /bye
 @end example
 
 
 
 @c
 @c  Assuan Protocol
 @c
 @manpause
 @node Dirmngr Protocol
 @section Dirmngr's Assuan Protocol
 
 Assuan is the IPC protocol used to access dirmngr.  This is a
 description of the commands implemented by dirmngr.
 
 @menu
 * Dirmngr LOOKUP::      Look up a certificate via LDAP
 * Dirmngr ISVALID::     Validate a certificate using a CRL or OCSP.
 * Dirmngr CHECKCRL::    Validate a certificate using a CRL.
 * Dirmngr CHECKOCSP::   Validate a certificate using OCSP.
 * Dirmngr CACHECERT::   Put a certificate into the internal cache.
 * Dirmngr VALIDATE::    Validate a certificate for debugging.
 @end menu
 
 @node Dirmngr LOOKUP
 @subsection Return the certificate(s) found
 
 Lookup certificate.  To allow multiple patterns (which are ORed)
 quoting is required: Spaces are to be translated into "+" or into
 "%20"; obviously this requires that the usual escape quoting rules
 are applied.  The server responds with:
 
 @example
   S: D <DER encoded certificate>
   S: END
   S: D <second DER encoded certificate>
   S: END
   S: OK
 @end example
 
 In this example 2 certificates are returned.  The server may return
 any number of certificates; OK will also be returned when no
 certificates were found.  The dirmngr might return a status line
 
 @example
   S: S TRUNCATED <n>
 @end example
 
 
 To indicate that the output was truncated to N items due to a
 limitation of the server or by an arbitrary set limit.
 
 The option @option{--url} may be used if instead of a search pattern a
 complete URL to the certificate is known:
 
 @example
   C: LOOKUP --url CN%3DWerner%20Koch,o%3DIntevation%20GmbH,c%3DDE?userCertificate
 @end example
 
 If the option @option{--cache-only} is given, no external lookup is done
 so that only certificates from the cache are returned.
 
 With the option @option{--single}, the first and only the first match
 will be returned.  Unless option @option{--cache-only} is also used, no
 local lookup will be done in this case.
 
 
 
 @node Dirmngr ISVALID
 @subsection Validate a certificate using a CRL or OCSP
 
 @example
   ISVALID [--only-ocsp] [--force-default-responder] @var{certid}|@var{certfpr}
 @end example
 
 Check whether the certificate described by the @var{certid} has been
 revoked.  Due to caching, the Dirmngr is able to answer immediately in
 most cases.
 
 The @var{certid} is a hex encoded string consisting of two parts,
 delimited by a single dot.  The first part is the SHA-1 hash of the
 issuer name and the second part the serial number.
 
 Alternatively the certificate's SHA-1 fingerprint @var{certfpr} may be
 given in which case an OCSP request is done before consulting the CRL.
 If the option @option{--only-ocsp} is given, no fallback to a CRL check
 will be used.  If the option @option{--force-default-responder} is
 given, only the default OCSP responder will be used and any other
 methods of obtaining an OCSP responder URL won't be used.
 
 @noindent
 Common return values are:
 
 @table @code
 @item GPG_ERR_NO_ERROR (0)
 This is the positive answer: The certificate is not revoked and we have
 an up-to-date revocation list for that certificate.  If OCSP was used
 the responder confirmed that the certificate has not been revoked.
 
 @item GPG_ERR_CERT_REVOKED
 This is the negative answer: The certificate has been revoked.  Either
 it is in a CRL and that list is up to date or an OCSP responder informed
 us that it has been revoked.
 
 @item GPG_ERR_NO_CRL_KNOWN
 No CRL is known for this certificate or the CRL is not valid or out of
 date.
 
 @item GPG_ERR_NO_DATA
 The OCSP responder returned an ``unknown'' status.  This means that it
 is not aware of the certificate's status.
 
 @item GPG_ERR_NOT_SUPPORTED
 This is commonly seen if OCSP support has not been enabled in the
 configuration.
 @end table
 
 If DirMngr has not enough information about the given certificate (which
 is the case for not yet cached certificates), it will inquire the
 missing data:
 
 @example
   S: INQUIRE SENDCERT <CertID>
   C: D <DER encoded certificate>
   C: END
 @end example
 
 A client should be aware that DirMngr may ask for more than one
 certificate.
 
 If Dirmngr has a certificate but the signature of the certificate
 could not been validated because the root certificate is not known to
 dirmngr as trusted, it may ask back to see whether the client trusts
 this the root certificate:
 
 @example
   S: INQUIRE ISTRUSTED <CertHexfpr>
   C: D 1
   C: END
 @end example
 
 Only this answer will let Dirmngr consider the certificate as valid.
 
 
 @node Dirmngr CHECKCRL
 @subsection Validate a certificate using a CRL
 
 Check whether the certificate with FINGERPRINT (SHA-1 hash of the
 entire X.509 certificate blob) is valid or not by consulting the CRL
 responsible for this certificate.  If the fingerprint has not been
 given or the certificate is not known, the function inquires the
 certificate using:
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 (which should match FINGERPRINT) as a binary blob.  Processing then
 takes place without further interaction; in particular dirmngr tries
 to locate other required certificate by its own mechanism which
 includes a local certificate store as well as a list of trusted root
 certificates.
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 revoked or one of the usual error codes from libgpg-error.
 
 @node Dirmngr CHECKOCSP
 @subsection Validate a certificate using OCSP
 
 @example
   CHECKOCSP [--force-default-responder] [@var{fingerprint}]
 @end example
 
 Check whether the certificate with @var{fingerprint} (the SHA-1 hash of
 the entire X.509 certificate blob) is valid by consulting the appropriate
 OCSP responder.  If the fingerprint has not been given or the
 certificate is not known by Dirmngr, the function inquires the
 certificate using:
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 (which should match @var{fingerprint}) as a binary blob.  Processing
 then takes place without further interaction; in particular dirmngr
 tries to locate other required certificates by its own mechanism which
 includes a local certificate store as well as a list of trusted root
 certificates.
 
 If the option @option{--force-default-responder} is given, only the
 default OCSP responder is used.  This option is the per-command variant
 of the global option @option{--ignore-ocsp-service-url}.
 
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 revoked or one of the usual error codes from libgpg-error.
 
 @node Dirmngr CACHECERT
 @subsection Put a certificate into the internal cache
 
 Put a certificate into the internal cache.  This command might be
 useful if a client knows in advance certificates required for a test and
 wants to make sure they get added to the internal cache.  It is also
 helpful for debugging.  To get the actual certificate, this command
 immediately inquires it using
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 as a binary blob.
 
 @noindent
 The return code is 0 for success; i.e. the certificate has not been
 successfully cached or one of the usual error codes from libgpg-error.
 
 @node Dirmngr VALIDATE
 @subsection Validate a certificate for debugging
 
 Validate a certificate using the certificate validation function used
 internally by dirmngr.  This command is only useful for debugging.  To
 get the actual certificate, this command immediately inquires it using
 
 @example
   S: INQUIRE TARGETCERT
   C: D <DER encoded certificate>
   C: END
 @end example
 
 Thus the caller is expected to return the certificate for the request
 as a binary blob.
 
 
 @mansect see also
 @ifset isman
 @command{gpgsm}(1),
 @command{dirmngr-client}(1)
 @end ifset
 @include see-also-note.texi
 
 @c
 @c !!! UNDER CONSTRUCTION !!!
 @c
 @c
 @c @section Verifying a Certificate
 @c
 @c There are several ways to request services from Dirmngr.  Almost all of
 @c them are done using the Assuan protocol.  What we describe here is the
 @c Assuan command CHECKCRL as used for example by the dirmnr-client tool if
 @c invoked as
 @c
 @c @example
 @c   dirmngr-client foo.crt
 @c @end example
 @c
 @c This command will send an Assuan request to an already running Dirmngr
 @c instance.  foo.crt is expected to be a standard X.509 certificate and
 @c dirmngr will receive the Assuan command
 @c
 @c @example
 @c    CHECKCRL @var [{fingerprint}]
 @c @end example
 @c
 @c @var{fingerprint} is optional and expected to be the SHA-1 has of the
 @c DER encoding of the certificate under question.  It is to be HEX
 @c encoded.  The rationale for sending the fingerprint is that it allows
 @c dirmngr to reply immediately if it has already cached such a request.  If
 @c this is not the case and no certificate has been found in dirmngr's
 @c internal certificate storage, dirmngr will request the certificate using
 @c the Assuan inquiry
 @c
 @c @example
 @c       INQUIRE TARGETCERT
 @c @end example
 @c
 @c The caller (in our example dirmngr-client) is then expected to return
 @c the certificate for the request (which should match @var{fingerprint})
 @c as a binary blob.
 @c
 @c Dirmngr now passes control to @code{crl_cache_cert_isvalid}.  This
 @c function checks whether a CRL item exists for target certificate.  These
 @c CRL items are kept in a database of already loaded and verified CRLs.
 @c This mechanism is called the CRL cache.  Obviously timestamps are kept
 @c there with each item to cope with the expiration date of the CRL.  The
 @c possible return values are: @code{0} to indicate that a valid CRL is
 @c available for the certificate and the certificate itself is not listed
 @c in this CRL, @code{GPG_ERR_CERT_REVOKED} to indicate that the certificate is
 @c listed in the CRL or @code{GPG_ERR_NO_CRL_KNOWN} in cases where no CRL or no
 @c information is available.  The first two codes are immediately returned to
 @c the caller and the processing of this request has been done.
 @c
 @c Only the @code{GPG_ERR_NO_CRL_KNOWN} needs more attention: Dirmngr now
 @c calls @code{clr_cache_reload_crl} and if this succeeds calls
 @c @code{crl_cache_cert_isvald) once more.  All further errors are
 @c immediately returned to the caller.
 @c
 @c @code{crl_cache_reload_crl} is the actual heart of the CRL management.
 @c It locates the corresponding CRL for the target certificate, reads and
 @c verifies this CRL and stores it in the CRL cache.  It works like this:
 @c
 @c * Loop over all crlDPs in the target certificate.
 @c     * If the crlDP is invalid immediately terminate the loop.
 @c     * Loop over all names in the current crlDP.
 @c         * If the URL scheme is unknown or not enabled
 @c           (--ignore-http-dp, --ignore-ldap-dp) continues with
 @c           the next name.
 @c         * @code{crl_fetch} is called to actually retrieve the CRL.
 @c           In case of problems this name is ignore and we continue with
 @c           the next name.  Note that @code{crl_fetch} does only return
 @c           a descriptor for the CRL for further reading so does the CRL
 @c           does not yet end up in memory.
 @c         * @code{crl_cache_insert} is called with that descriptor to
 @c           actually read the CRL into the cache. See below for a
 @c           description of this function.  If there is any error (e.g. read
 @c           problem, CRL not correctly signed or verification of signature
 @c           not possible), this descriptor is rejected and we continue
 @c           with the next name.  If the CRL has been successfully loaded,
 @c           the loop is terminated.
 @c * If no crlDP has been found in the previous loop use a default CRL.
 @c   Note, that if any crlDP has been found but loading of the CRL failed,
 @c   this condition is not true.
 @c     * Try to load a CRL from all configured servers (ldapservers.conf)
 @c       in turn.  The first server returning a CRL is used.
 @c     * @code(crl_cache_insert) is then used to actually insert the CRL
 @c       into the cache.  If this failed we give up immediately without
 @c       checking the rest of the servers from the first step.
 @c * Ready.
 @c
 @c
 @c The @code{crl_cache_insert} function takes care of reading the bulk of
 @c the CRL, parsing it and checking the signature.  It works like this: A
 @c new database file is created using a temporary file name.  The CRL
 @c parsing machinery is started and all items of the CRL are put into
 @c this database file.  At the end the issuer certificate of the CRL
 @c needs to be retrieved.  Three cases are to be distinguished:
 @c
 @c  a) An authorityKeyIdentifier with an issuer and serialno exits: The
 @c     certificate is retrieved using @code{find_cert_bysn}.  If
 @c     the certificate is in the certificate cache, it is directly
 @c     returned. Then the requester (i.e. the client who requested the
 @c     CRL check) is asked via the Assuan inquiry ``SENDCERT'' whether
 @c     he can provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested issuer and seriano (This is
 @c     needed because the LDAP layer may return several certificates as
 @c     LDAP as no standard way to retrieve by serial number).
 @c
 @c  b) An authorityKeyIdentifier with a key ID exists: The certificate is
 @c     retrieved using @code{find_cert_bysubject}.  If the certificate is
 @c     in the certificate cache, it is directly returned.  Then the
 @c     requester is asked via the Assuan inquiry ``SENDCERT_SKI'' whether
 @c     he can provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested subject and key ID.
 @c
 @c  c) No authorityKeyIdentifier exits: The certificate is retrieved
 @c     using @code{find_cert_bysubject} without the key ID argument.  If
 @c     the certificate is in the certificate cache the first one with a
 @c     matching subject is directly returned.  Then the requester is
 @c     asked via the Assuan inquiry ``SENDCERT'' and an exact
 @c     specification of the subject whether he can
 @c     provide this certificate.  If this succeed the returned
 @c     certificate gets cached and returned.  Note, that dirmngr does not
 @c     verify in any way whether the expected certificate is returned.
 @c     It is in the interest of the client to return a useful certificate
 @c     as otherwise the service request will fail due to a bad signature.
 @c     The last way to get the certificate is by looking it up at
 @c     external resources.  This is done using the @code{ca_cert_fetch}
 @c     and @code{fetch_next_ksba_cert} and comparing the returned
 @c     certificate to match the requested subject; the first certificate
 @c     with a matching subject is then returned.
 @c
 @c If no certificate was found, the function returns with the error
 @c GPG_ERR_MISSING_CERT.  Now the signature is verified.  If this fails,
 @c the erro is returned.  On success the @code{validate_cert_chain} is
 @c used to verify that the certificate is actually valid.
 @c
 @c Here we may encounter a recursive situation:
 @c @code{validate_cert_chain} needs to look at other certificates and
 @c also at CRLs to check whether these other certificates and well, the
 @c CRL issuer certificate itself are not revoked.  FIXME: We need to make
 @c sure that @code{validate_cert_chain} does not try to lookup the CRL we
 @c are currently processing. This would be a catch-22 and may indicate a
 @c broken PKI.  However, due to overlapping expiring times and imprecise
 @c clocks this may actually happen.
 @c
 @c For historical reasons the Assuan command ISVALID is a bit different
 @c to CHECKCRL but this is mainly due to different calling conventions.
 @c In the end the same fucntionality is used, albeit hidden by a couple
 @c of indirection and argument and result code mangling.  It furthere
 @c ingetrages OCSP checking depending on options are the way it is
 @c called.  GPGSM still uses this command but might eventuall switch over
 @c to CHECKCRL and CHECKOCSP so that ISVALID can be retired.
 @c
 @c
 @c @section Validating a certificate
 @c
 @c We describe here how the internal function @code{validate_cert_chain}
 @c works. Note that mainly testing purposes this functionality may be
 @c called directly using @cmd{dirmngr-client --validate @file{foo.crt}}.
 @c
 @c The function takes the target certificate and a mode argument as
 @c parameters and returns an error code and optionally the closes
 @c expiration time of all certificates in the chain.
 @c
 @c We first check that the certificate may be used for the requested
 @c purpose (i.e. OCSP or CRL signing).  If this is not the case
 @c GPG_ERR_WRONG_KEY_USAGE is returned.
 @c
 @c The next step is to find the trust anchor (root certificate) and to
 @c assemble the chain in memory: Starting with the target certificate,
 @c the expiration time is checked against the current date, unknown
 @c critical extensions are detected and certificate policies are matched
 @c (We only allow 2.289.9.9 but I have no clue about that OID and from
 @c where I got it - it does not even seem to be assigned - debug cruft?).
 @c
 @c Now if this certificate is a self-signed one, we have reached the
 @c trust anchor.  In this case we check that the signature is good, the
 @c certificate is allowed to act as a CA, that it is a trusted one (by
 @c checking whether it is has been put into the trusted-certs
 @c configuration directory) and finally prepend into to our list
 @c representing the certificate chain.  This steps ends then.
 @c
 @c If it is not a self-signed certificate, we check that the chain won't
 @c get too long (current limit is 100), if this is the case we terminate
 @c with the error GPG_ERR_BAD_CERT_CHAIN.
 @c
 @c Now the issuer's certificate is looked up: If an
 @c authorityKeyIdentifier is available, this one is used to locate the
 @c certificate either using issuer and serialnumber or subject DN
 @c (i.e. the issuer's DN) and the keyID.  The functions
 @c @code{find_cert_bysn) and @code{find_cert_bysubject} are used
 @c respectively. The have already been described above under the
 @c description of @code{crl_cache_insert}.  If no certificate was found
 @c or with no authorityKeyIdentifier, only the cache is consulted using
 @c @code{get_cert_bysubject}.  The latter is done under the assumption
 @c that a matching certificate has explicitly been put into the
 @c certificate cache.  If the issuer's certificate could not be found,
 @c the validation terminates with the error code @code{GPG_ERR_MISSING_CERT}.
 @c
 @c If the issuer's certificate has been found, the signature of the
 @c actual certificate is checked and in case this fails the error
 @c #code{GPG_ERR_BAD_CERT_CHAIN} is returned.  If the signature checks out, the
 @c maximum chain length of the issuing certificate is checked as well as
 @c the capability of the certificate (i.e. whether he may be used for
 @c certificate signing).  Then the certificate is prepended to our list
 @c representing the certificate chain.  Finally the loop is continued now
 @c with the issuer's certificate as the current certificate.
 @c
 @c After the end of the loop and if no error as been encountered
 @c (i.e. the certificate chain has been assempled correctly), a check is
 @c done whether any certificate expired or a critical policy has not been
 @c met.  In any of these cases the validation terminates with an
 @c appropriate error.
 @c
 @c Finally the function @code{check_revocations} is called to verify no
 @c certificate in the assempled chain has been revoked: This is an
 @c recursive process because a CRL has to be checked for each certificate
 @c in the chain except for the root certificate, of which we already know
 @c that it is trusted and we avoid checking a CRL here due to common
 @c setup problems and the assumption that a revoked root certificate has
 @c been removed from the list of trusted certificates.
 @c
 @c
 @c
 @c
 @c @section Looking up certificates through LDAP.
 @c
 @c This describes the LDAP layer to retrieve certificates.
 @c the functions @code{ca_cert_fetch} and @code{fetch_next_ksba_cert} are
 @c used for this.  The first one starts a search and the second one is
 @c used to retrieve certificate after certificate.
 @c