From 97e90d7b8928f49c00ff8109a371e0613821fbc1 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Fri, 12 Dec 2014 21:40:09 +0000 Subject: ntlm: Allow NTLM2Session messages when USE_NTRESPONSES manually defined Previously USE_NTLM2SESSION would only be defined automatically when USE_NTRESPONSES wasn't already defined. Separated the two definitions so that the user can manually set USE_NTRESPONSES themselves but USE_NTLM2SESSION is defined automatically if they don't define it. --- lib/curl_ntlm_core.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'lib/curl_ntlm_core.h') diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h index a600f0a7f..c9dde7e4c 100644 --- a/lib/curl_ntlm_core.h +++ b/lib/curl_ntlm_core.h @@ -39,18 +39,17 @@ # endif #endif -/* - * Define USE_NTRESPONSES to 1 in order to make the type-3 message include - * the NT response message. Define USE_NTLM2SESSION to 1 in order to make - * the type-3 message include the NTLM2Session response message, requires - * USE_NTRESPONSES defined to 1. - */ - +/* Define USE_NTRESPONSES to 1 in order to make the type-3 message include + * the NT response message. */ #ifndef USE_NTRESPONSES -# define USE_NTRESPONSES 1 -# ifndef USE_WIN32_CRYPTO -# define USE_NTLM2SESSION 1 -# endif +#define USE_NTRESPONSES 1 +#endif + +/* Define USE_NTLM2SESSION to 1 in order to make the type-3 message include the + NTLM2Session response message, requires USE_NTRESPONSES defined to 1 and a + Crypto engine that we have curl_ssl_md5sum() for. */ +#if !defined(USE_NTLM2SESSION) && USE_NTRESPONSES && !defined(USE_WIN32_CRYPTO) +#define USE_NTLM2SESSION 1 #endif void Curl_ntlm_core_lm_resp(const unsigned char *keys, -- cgit v1.2.1