diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-05-10 13:10:34 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-05-11 17:23:32 +0100 |
| commit | 5c2aebe308e459d2ca8fad29bde7885190ffe262 (patch) | |
| tree | 65b012ccc16164946fc36d5637609c8dc4de4959 | |
| parent | fb243b0475c2a3a60889120ee3f05380e60645f0 (diff) | |
| download | curl-5c2aebe308e459d2ca8fad29bde7885190ffe262.tar.gz | |
http_digest: Don't expose functions when HTTP and Crypto Auth are disabled
Closes #3861
| -rw-r--r-- | lib/easy.c | 3 | ||||
| -rw-r--r-- | lib/http_digest.h | 10 | ||||
| -rw-r--r-- | lib/url.c | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lib/easy.c b/lib/easy.c index 39482469c..40be38220 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -961,7 +961,10 @@ void curl_easy_reset(struct Curl_easy *data) /* zero out authentication data: */ memset(&data->state.authhost, 0, sizeof(struct auth)); memset(&data->state.authproxy, 0, sizeof(struct auth)); + +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) Curl_digest_cleanup(data); +#endif } /* diff --git a/lib/http_digest.h b/lib/http_digest.h index fd225c7c1..d3db16a33 100644 --- a/lib/http_digest.h +++ b/lib/http_digest.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -23,6 +23,8 @@ ***************************************************************************/ #include "curl_setup.h" +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) + /* this is for digest header input */ CURLcode Curl_input_digest(struct connectdata *conn, bool proxy, const char *header); @@ -33,10 +35,8 @@ CURLcode Curl_output_digest(struct connectdata *conn, const unsigned char *request, const unsigned char *uripath); -#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) void Curl_digest_cleanup(struct Curl_easy *data); -#else -#define Curl_digest_cleanup(x) Curl_nop_stmt -#endif + +#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_CRYPTO_AUTH */ #endif /* HEADER_CURL_HTTP_DIGEST_H */ @@ -379,7 +379,9 @@ CURLcode Curl_close(struct Curl_easy *data) Curl_altsvc_cleanup(data->asi); data->asi = NULL; #endif +#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH) Curl_digest_cleanup(data); +#endif Curl_safefree(data->info.contenttype); Curl_safefree(data->info.wouldredirect); |