moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

sasl: Corrected pre-processor inclusion of SSPI based DIGEST-MD5 code 

When CURL_DISABLE_CRYPTO_AUTH is defined the DIGEST-MD5 code should not
be included, regardless of whether USE__WINDOWS_SSPI is defined or not.
This is indicated by the definition of USE_HTTP_NEGOTIATE and USE_NTLM
in curl_setup.h.
This commit is contained in:
Steve Holme 2014-04-06 12:46:53 +01:00
parent 607883f13c
commit 19a514237d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/curl_sasl.h
View File

@ -76,9 +76,7 @@ CURLcode Curl_sasl_create_cram_md5_message(struct SessionHandle *data,
const char *user,
const char *passwdp,
char **outptr, size_t *outlen);
#endif
#if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_WINDOWS_SSPI)
/* This is used to decode a base64 encoded DIGEST-MD5 challange message */
CURLcode Curl_sasl_decode_digest_md5_message(const char *chlg64,
char *nonce, size_t nlen,

4
lib/curl_sasl_sspi.c
View File

@ -25,7 +25,7 @@
#include "curl_setup.h"
#if defined(USE_WINDOWS_SSPI)
#if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_CRYPTO_AUTH)
#include <curl/curl.h>
@ -189,4 +189,4 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
return result;
}
#endif /* USE_WINDOWS_SSPI */
#endif /* USE_WINDOWS_SSPI && !CURL_DISABLE_CRYPTO_AUTH */