aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-04-06 12:46:53 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-04-06 13:01:14 +0100
commit19a514237d5ebc8ad800883b9a12fc56de1c01c6 (patch)
tree20a743f09b65040dece311e7f107bf987ad88201 /lib
parent607883f13cedae4badfb4124a85cae2635f14c2c (diff)
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/curl_sasl.h2
-rw-r--r--lib/curl_sasl_sspi.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 6d15c708c..12f78404c 100644
--- a/lib/curl_sasl.h
+++ b/lib/curl_sasl.h
@@ -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,
diff --git a/lib/curl_sasl_sspi.c b/lib/curl_sasl_sspi.c
index e9eaf3230..9b67498e9 100644
--- a/lib/curl_sasl_sspi.c
+++ b/lib/curl_sasl_sspi.c
@@ -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 */