USE_WIN32_CRYPTO check removed to get USE_NTLM2SESSION set.

[MonkeybreadSoftware]

To fix NTLM fails #3041

[bagder]

Thanks!

[bagder]

Had to revert this due to #3708

[MonkeybreadSoftware]

So we need a check for #ifdef USE_SSL?

I assumed it would be more difficult than just changing one #if

[MarcelRaad]

Something like this maybe?

 lib/curl_ntlm_core.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h
index 07ef5deae..cda6135bd 100644
--- a/lib/curl_ntlm_core.h
+++ b/lib/curl_ntlm_core.h
@@ -50,7 +50,9 @@
 /* Define USE_NTLM2SESSION 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_NTRESPONSES) && !defined(USE_WIN32_CRYPTO)
+#if defined(USE_NTRESPONSES) && \
+  (!defined(USE_WIN32_CRYPTO) || \
+    (defined(USE_SSL) && !defined(CURL_DISABLE_CRYPTO_AUTH)))
 #define USE_NTLM2SESSION
 #endif

[bagder]

Looks fine to me. @MonkeybreadSoftware will you amend the PR?

[MonkeybreadSoftware]

I changed commit, so lets see what is says.

[bagder]

That had a syntax error. Fix and try again?

[MonkeybreadSoftware]

Well, tests failed due to #if line broken into three lines.
Should we simply change to one line or will that cause trouble with other checks due to line length?

[bagder]

Yes, splitting an #if on multiple lines needs each line to end with a backslash (\) to indicate a continuation.

[MonkeybreadSoftware]

but that is exactly what the change above shows!?
Sorry, I am confused.

[bagder]

Look again at your commit: d0a030e ... it has no backslashes on the end of the two lines that are continued.

[MonkeybreadSoftware]

I was looking at Marcel's diff above. Now I committed the change with the missing backslashes. Sorry.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

[MonkeybreadSoftware]

and now?
Did this go into a release?

[bagder]

If it had, it would say so. It has just collected dust here...

[bagder]

Thanks!