security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-12 22:11:29 +02:00
Code Activity

dirmngr: Fix proxy with TLS.

Browse Source 
* 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
This commit is contained in:
NIIBE Yutaka 2024-02-15 15:38:34 +09:00 committed by Werner Koch
parent 23d9093d9b
commit d6c428699d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dirmngr/http.c
View File

@ -2498,9 +2498,7 @@ proxy_get_token (proxy_info_t proxy, const char *inputstring)
} }
/* Use the CONNECT method to proxy our TLS stream. */ /* Use the CONNECT method to proxy our TLS stream. */
#ifdef USE_TLS
static gpg_error_t static gpg_error_t
run_proxy_connect (http_t hd, proxy_info_t proxy, run_proxy_connect (http_t hd, proxy_info_t proxy,
const char *httphost, const char *server, const char *httphost, const char *server,
@ -2709,7 +2707,6 @@ run_proxy_connect (http_t hd, proxy_info_t proxy,
xfree (tmpstr); xfree (tmpstr);
return err; return err;
} }
#endif /*USE_TLS*/
/* Make a request string using a standard proxy. On success the /* 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; goto leave;
} }
#if USE_TLS
if (use_http_proxy && hd->uri->use_tls) if (use_http_proxy && hd->uri->use_tls)
{ {
err = run_proxy_connect (hd, proxy, httphost, server, port); 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. */ * clear the flag to indicate this. */
use_http_proxy = 0; use_http_proxy = 0;
} }
#endif /* USE_TLS */
#if HTTP_USE_NTBTLS #if HTTP_USE_NTBTLS
err = run_ntbtls_handshake (hd); err = run_ntbtls_handshake (hd);