diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2017-09-22 15:47:14 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2017-09-23 13:58:14 -0400 |
| commit | 953b5c4e2602711c031a4f6cd024051a72329015 (patch) | |
| tree | fdecee4fc5d80a599bdbca662cd83cfa0915de22 /lib/curl_ntlm_core.h | |
| parent | afbdc96638a769d9bee8579d8b70f54537f5e891 (diff) | |
ntlm: move NTLM_NEEDS_NSS_INIT define into core NTLM header
.. and include the core NTLM header in all NTLM-related source files.
Follow up to 6f86022. Since then http_ntlm checks NTLM_NEEDS_NSS_INIT
but did not include vtls.h where it was defined.
Closes https://github.com/curl/curl/pull/1911
Diffstat (limited to 'lib/curl_ntlm_core.h')
| -rw-r--r-- | lib/curl_ntlm_core.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h index 21d09b78e..07ef5deae 100644 --- a/lib/curl_ntlm_core.h +++ b/lib/curl_ntlm_core.h @@ -26,6 +26,15 @@ #if defined(USE_NTLM) +/* If NSS is the first available SSL backend (see order in curl_ntlm_core.c) + then it must be initialized to be used by NTLM. */ +#if !defined(USE_OPENSSL) && \ + !defined(USE_GNUTLS_NETTLE) && \ + !defined(USE_GNUTLS) && \ + defined(USE_NSS) +#define NTLM_NEEDS_NSS_INIT +#endif + #if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO) #ifdef USE_OPENSSL |