Commit dcd484a2 authored by Steve Holme's avatar Steve Holme
Browse files

smb: Fixed Windows autoconf builds following commit eb88d778 

As Windows based autoconf builds don't yet define USE_WIN32_CRYPTO
either explicitly through --enable-win32-cypto or automatically on
_WIN32 based platforms, subsequent builds broke with the following
error message:

"Can't compile NTLM support without a crypto library."
parent 090232ea

lib/curl_ntlm_core.c

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
 * http://www.innovation.ch/java/ntlm.html

 */



#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)



#ifdef USE_SSLEAY



#  ifdef USE_OPENSSL
@@ -734,4 +736,6 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash, 


#endif /* USE_NTRESPONSES */



#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */



#endif /* USE_NTLM */

lib/curl_ntlm_core.h

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#if defined(USE_NTLM)



#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)



#ifdef USE_SSLEAY

#  if !defined(OPENSSL_VERSION_NUMBER) && \

      !defined(HEADER_SSL_H) && !defined(HEADER_MD5_H)
@@ -90,6 +92,8 @@ CURLcode Curl_ntlm_core_mk_lmv2_resp(unsigned char *ntlmv2hash, 


#endif /* USE_NTRESPONSES */



#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */



#endif /* USE_NTLM */



#endif /* HEADER_CURL_NTLM_CORE_H */

lib/smb.c

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)



#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)



#define BUILDING_CURL_SMB_C



#ifdef _WIN32
@@ -894,4 +896,6 @@ static CURLcode smb_parse_url_path(struct connectdata *conn) 
  return CURLE_OK;

}



#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */



#endif /* CURL_DISABLE_SMB && USE_NTLM */

lib/smb.h

+4 −0
Original line number Diff line number Diff line
@@ -258,9 +258,13 @@ struct smb_tree_disconnect { 


#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)



#if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)



extern const struct Curl_handler Curl_handler_smb;

extern const struct Curl_handler Curl_handler_smbs;



#endif /* !USE_WINDOWS_SSPI || USE_WIN32_CRYPTO */



#endif /* CURL_DISABLE_SMB && USE_NTLM */



#endif /* HEADER_CURL_SMB_H */

lib/url.c

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ static const struct Curl_handler * const protocols[] = { 
#endif

#endif



#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)

#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \

   (!defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO))

  &Curl_handler_smb,

#ifdef USE_SSL

  &Curl_handler_smbs,