diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-08-15 21:29:54 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-08-15 21:29:54 +0200 |
| commit | 7c229d538824cb679351220ad8911f7b2daa7c23 (patch) | |
| tree | 5c4d64b60da9018c7db3a9335a9787d326beade3 /src/openvpn/proxy.c | |
| parent | d3986a312f5fbcfd0e78e6b147eef419fb4e5f54 (diff) | |
| parent | 1079962e4c06f88a54e50d997c1b7e84303d30b4 (diff) | |
Update upstream source from tag 'upstream/2.5_beta1'
Update to upstream version '2.5~beta1'
with Debian dir d53f9a482ac24eb491a294b26c24bb1d87afad24
Diffstat (limited to 'src/openvpn/proxy.c')
| -rw-r--r-- | src/openvpn/proxy.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c index afcca86..9998623 100644 --- a/src/openvpn/proxy.c +++ b/src/openvpn/proxy.c @@ -318,7 +318,6 @@ static int get_proxy_authenticate(socket_descriptor_t sd, int timeout, char **data, - struct gc_arena *gc, volatile int *signal_received) { char buf[256]; @@ -341,14 +340,14 @@ get_proxy_authenticate(socket_descriptor_t sd, if (!strncmp(buf+20, "Basic ", 6)) { msg(D_PROXY, "PROXY AUTH BASIC: '%s'", buf); - *data = string_alloc(buf+26, gc); + *data = string_alloc(buf+26, NULL); ret = HTTP_AUTH_BASIC; } #if PROXY_DIGEST_AUTH else if (!strncmp(buf+20, "Digest ", 7)) { msg(D_PROXY, "PROXY AUTH DIGEST: '%s'", buf); - *data = string_alloc(buf+27, gc); + *data = string_alloc(buf+27, NULL); ret = HTTP_AUTH_DIGEST; } #endif @@ -885,10 +884,10 @@ establish_http_proxy_passthru(struct http_proxy_info *p, const char *algor = get_pa_var("algorithm", pa, &gc); const char *opaque = get_pa_var("opaque", pa, &gc); - if ( !realm || !nonce ) + if (!realm || !nonce) { msg(D_LINK_ERRORS, "HTTP proxy: digest auth failed, malformed response " - "from server: realm= or nonce= missing" ); + "from server: realm= or nonce= missing" ); goto error; } @@ -997,7 +996,6 @@ establish_http_proxy_passthru(struct http_proxy_info *p, const int method = get_proxy_authenticate(sd, get_server_poll_remaining_time(server_poll_timeout), &pa, - NULL, signal_received); if (method != HTTP_AUTH_NONE) { |