[GNUnet-SVN] [gnurl] 152/219: http_digest: Don't expose functions when HTTP and Crypto Auth are disabled

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 5c2aebe308e459d2ca8fad29bde7885190ffe262
Author: Steve Holme <address@hidden>
AuthorDate: Fri May 10 13:10:34 2019 +0100

    http_digest: Don't expose functions when HTTP and Crypto Auth are disabled
    
    Closes #3861
---
 lib/easy.c        |  3 +++
 lib/http_digest.h | 10 +++++-----
 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, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, 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 */
diff --git a/lib/url.c b/lib/url.c
index cd775af4a..02198627e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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);
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden