Commit 19a51423 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent 607883f1

lib/curl_sasl.h

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

lib/curl_sasl_sspi.c

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