moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

ntlm: move NTLM_NEEDS_NSS_INIT define into core NTLM header

Browse Source 
.. 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
This commit is contained in:
Jay Satiro 2017-09-22 15:47:14 -04:00
parent afbdc96638
commit 953b5c4e26
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/curl_ntlm_core.h
View File

@ -26,6 +26,15 @@
#if defined(USE_NTLM) #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) #if !defined(USE_WINDOWS_SSPI) || defined(USE_WIN32_CRYPTO)
#ifdef USE_OPENSSL #ifdef USE_OPENSSL

1
lib/curl_ntlm_wb.c
View File

@ -48,6 +48,7 @@
#include "sendf.h" #include "sendf.h"
#include "select.h" #include "select.h"
#include "vauth/ntlm.h" #include "vauth/ntlm.h"
#include "curl_ntlm_core.h"
#include "curl_ntlm_wb.h" #include "curl_ntlm_wb.h"
#include "url.h" #include "url.h"
#include "strerror.h" #include "strerror.h"

1
lib/http_ntlm.c
View File

@ -37,6 +37,7 @@
#include "sendf.h" #include "sendf.h"
#include "strcase.h" #include "strcase.h"
#include "http_ntlm.h" #include "http_ntlm.h"
#include "curl_ntlm_core.h"
#include "curl_ntlm_wb.h" #include "curl_ntlm_wb.h"
#include "vauth/vauth.h" #include "vauth/vauth.h"
#include "url.h" #include "url.h"

1
lib/vauth/ntlm_sspi.c
View File

@ -29,6 +29,7 @@
#include "vauth/vauth.h" #include "vauth/vauth.h"
#include "urldata.h" #include "urldata.h"
#include "curl_base64.h" #include "curl_base64.h"
#include "curl_ntlm_core.h"
#include "warnless.h" #include "warnless.h"
#include "curl_multibyte.h" #include "curl_multibyte.h"
#include "sendf.h" #include "sendf.h"

9
lib/vtls/vtls.h
View File

@ -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_LENGTH 8
#define ALPN_HTTP_1_1 "http/1.1" #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 /* 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 */ proxy or for the remote host - to properly support HTTPS proxy */