diff options
| author | NIIBE Yutaka <[email protected]> | 2024-02-15 06:38:34 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-02-21 14:09:07 +0000 |
| commit | d6c428699db7aa20f8b6ca9fe83197a0314b7e91 (patch) | |
| tree | 0787e2fb454b7ce3a9a434280912eb2f993f2ffd | |
| parent | More NEWS. (diff) | |
| download | gnupg-d6c428699db7aa20f8b6ca9fe83197a0314b7e91.tar.gz gnupg-d6c428699db7aa20f8b6ca9fe83197a0314b7e91.zip | |
dirmngr: Fix proxy with TLS.
* dirmngr/http.c (proxy_get_token, run_proxy_connect): Always
available regardless of USE_TLS.
(send_request): Remove USE_TLS.
--
Since quite some time building w/o TLS won't work.
GnuPG-bug-id: 6997
| -rw-r--r-- | dirmngr/http.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/dirmngr/http.c b/dirmngr/http.c index 216346782..57366d6bc 100644 --- a/dirmngr/http.c +++ b/dirmngr/http.c @@ -2498,9 +2498,7 @@ proxy_get_token (proxy_info_t proxy, const char *inputstring) } - /* Use the CONNECT method to proxy our TLS stream. */ -#ifdef USE_TLS static gpg_error_t run_proxy_connect (http_t hd, proxy_info_t proxy, const char *httphost, const char *server, @@ -2709,7 +2707,6 @@ run_proxy_connect (http_t hd, proxy_info_t proxy, xfree (tmpstr); return err; } -#endif /*USE_TLS*/ /* Make a request string using a standard proxy. On success the @@ -2866,7 +2863,6 @@ send_request (http_t hd, const char *httphost, const char *auth, goto leave; } -#if USE_TLS if (use_http_proxy && hd->uri->use_tls) { err = run_proxy_connect (hd, proxy, httphost, server, port); @@ -2878,7 +2874,6 @@ send_request (http_t hd, const char *httphost, const char *auth, * clear the flag to indicate this. */ use_http_proxy = 0; } -#endif /* USE_TLS */ #if HTTP_USE_NTBTLS err = run_ntbtls_handshake (hd); |