Commit 953b5c4e authored by Jay Satiro's avatar Jay Satiro
Browse files

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 6f86022d. 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
parent afbdc966

lib/curl_ntlm_core.h

+9 −0
Original line number Diff line number Diff line
@@ -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

lib/curl_ntlm_wb.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "sendf.h"

#include "select.h"

#include "vauth/ntlm.h"

#include "curl_ntlm_core.h"

#include "curl_ntlm_wb.h"

#include "url.h"

#include "strerror.h"

lib/http_ntlm.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "sendf.h"

#include "strcase.h"

#include "http_ntlm.h"

#include "curl_ntlm_core.h"

#include "curl_ntlm_wb.h"

#include "vauth/vauth.h"

#include "url.h"

lib/vauth/ntlm_sspi.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "vauth/vauth.h"

#include "urldata.h"

#include "curl_base64.h"

#include "curl_ntlm_core.h"

#include "warnless.h"

#include "curl_multibyte.h"

#include "sendf.h"

lib/vtls/vtls.h

+0 −9
Original line number Diff line number Diff line
@@ -124,15 +124,6 @@ CURLcode Curl_none_md5sum(unsigned char *input, size_t inputlen, 
#define ALPN_HTTP_1_1_LENGTH 8

#define ALPN_HTTP_1_1 "http/1.1"



/* If NTLM is the first available SSL backend (see order in curl_ntlm_core)

   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



/* set of helper macros for the backends to access the correct fields. For the

   proxy or for the remote host - to properly support HTTPS proxy */