Unverified Commit 5c2aebe3 authored by Steve Holme's avatar Steve Holme
Browse files

http_digest: Don't expose functions when HTTP and Crypto Auth are disabled 

Closes #3861
parent fb243b04

lib/easy.c

+3 −0
Original line number Diff line number Diff line
@@ -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

}



/*

lib/http_digest.h

+5 −5
Original line number Diff line number Diff line
@@ -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 */

lib/url.c

+2 −0
Original line number Diff line number Diff line
@@ -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);