From 6983fd131f648ba4acd57b266de9868911874d14 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 19 Oct 2015 13:12:24 +0200 Subject: dirmngr: Make --use-tor work - still leaks DNS. * dirmngr/dirmngr.c (set_tor_mode): New. (main, reread_configuration): Call it. * dirmngr/http.c (http_raw_connect, send_request): Check whether TOR mode is enabled if the FORCE_TOR flag is given. -- The patch for http.c is a sanity check because tor mode is anyway global as long as the Assuan socket wrappers are used. Signed-off-by: Werner Koch --- dirmngr/http.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'dirmngr/http.c') diff --git a/dirmngr/http.c b/dirmngr/http.c index 6ba29873d..6f8bf3da0 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -751,8 +751,13 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port, if ((flags & HTTP_FLAG_FORCE_TOR)) { - log_error ("TOR support is not yet available\n"); - return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED); + 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); + } } /* Create the handle. */ @@ -1466,8 +1471,13 @@ send_request (http_t hd, const char *httphost, const char *auth, if ((hd->flags & HTTP_FLAG_FORCE_TOR)) { - log_error ("TOR support is not yet available\n"); - return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED); + 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); + } } server = *hd->uri->host ? hd->uri->host : "localhost"; -- cgit v1.2.3