summaryrefslogtreecommitdiffstats
path: root/dirmngr/http.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-12-02 18:47:50 +0100
committerWerner Koch <wk@gnupg.org>2015-12-02 18:57:49 +0100
commit69db3285e4612ad24462149a4d64cc32c090a491 (patch)
treee19035a1f90ddd2a18a7bf2c28ac34dd33fe0622 /dirmngr/http.c
parentgpg: Improve documentation. (diff)
downloadgnupg2-69db3285e4612ad24462149a4d64cc32c090a491.tar.xz
gnupg2-69db3285e4612ad24462149a4d64cc32c090a491.zip
build: Require at least Libassuan 2.4.1.
* configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1. * agent/gpg-agent.c (create_server_socket): Remove check for libassuan >= 2.3.0 and >= 2.1.4. (main): Remove check for libassuan >= 2.1.4. * scd/scdaemon.c (create_server_socket): Remove check for libassuan >= 2.1.4. * dirmngr/dirmngr.c (set_tor_mode): Remove check for libassuan >= 2.3.0. * dirmngr/http.c (http_raw_connect, send_request): Remove checks for libassuan >= 2.3.0. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/http.c')
-rw-r--r--dirmngr/http.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 642795196..74b6911a3 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -753,9 +753,7 @@ http_raw_connect (http_t *r_hd, const char *server, unsigned short port,
{
int mode;
-#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
-#endif
{
log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);
@@ -1481,9 +1479,7 @@ send_request (http_t hd, const char *httphost, const char *auth,
{
int mode;
-#if ASSUAN_VERSION_NUMBER >= 0x020300 /* >= 2.3.0 */
if (assuan_sock_get_flag (ASSUAN_INVALID_FD, "tor-mode", &mode) || !mode)
-#endif
{
log_error ("Tor support is not available\n");
return gpg_err_make (default_errsource, GPG_ERR_NOT_IMPLEMENTED);