From: Steve Holme <steve_holme@hotmail.com>
Date: Fri, 12 Dec 2014 19:46:56 +0000 (+0000)
Subject: config-win32.h: Don't enable Windows Crypt API if using OpenSSL
X-Git-Tag: curl-7_40_0~173
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd2231104be563684aa48cd43ab2ed2d1ee4c5b4;p=thirdparty%2Fcurl.git

config-win32.h: Don't enable Windows Crypt API if using OpenSSL

As the OpenSSL and NSS Crypto engines are prefered by the core NTLM
routines, to the Windows Crypt API, don't define USE_WIN32_CRYPT
automatically when either OpenSSL or NSS are in use - doing so would
disable NTLM2Session responses in NTLM type-3 messages.
---

diff --git a/lib/config-win32.h b/lib/config-win32.h
index ba3e7a708b..95f1595bec 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -700,7 +700,9 @@
 #endif
 
 /* Define to use the Windows crypto library. */
+#if !defined(USE_SSLEAY) && !defined(USE_NSS)
 #define USE_WIN32_CRYPTO
+#endif
 
 /* ---------------------------------------------------------------- */
 /*                       ADDITIONAL DEFINITIONS                     */