[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 228/256: ntlm: move NTLM_NEEDS_NSS_INIT define into
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 228/256: ntlm: move NTLM_NEEDS_NSS_INIT define into core NTLM header |
Date: |
Fri, 06 Oct 2017 19:45:19 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 953b5c4e2602711c031a4f6cd024051a72329015
Author: Jay Satiro <address@hidden>
AuthorDate: Fri Sep 22 15:47:14 2017 -0400
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
---
lib/curl_ntlm_core.h | 9 +++++++++
lib/curl_ntlm_wb.c | 1 +
lib/http_ntlm.c | 1 +
lib/vauth/ntlm_sspi.c | 1 +
lib/vtls/vtls.h | 9 ---------
5 files changed, 12 insertions(+), 9 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
diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index ac0e12456..03f47a3a5 100644
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -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"
diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c
index 28e638e69..0f1edcf65 100644
--- a/lib/http_ntlm.c
+++ b/lib/http_ntlm.c
@@ -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"
diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index f99325710..e748ce3b6 100644
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -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"
diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h
index b85b365e5..f1a11ea58 100644
--- a/lib/vtls/vtls.h
+++ b/lib/vtls/vtls.h
@@ -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 */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 210/256: cookies: use lock when using CURLINFO_COOKIELIST, (continued)
- [GNUnet-SVN] [gnurl] 210/256: cookies: use lock when using CURLINFO_COOKIELIST, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 208/256: mime:escape_string minor clarification change, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 160/256: openssl: Integrate Peter Wu's SSLKEYLOGFILE implementation, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 177/256: configure: use -Wno-varargs on clang 3.9[.X] debug builds, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 172/256: KNOWN_BUGS: Remove CMake symbol hiding issue, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 213/256: curl: check fseek() return code and bail on error, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 120/256: non-ascii: allow conversion functions to be called with a NULL data handle., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 244/256: libcurl-tutorial: fix two typos., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 205/256: travis: on mac, don't install openssl or libidn, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 247/256: test1153: verify quoted double-qoutes in PWD response, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 228/256: ntlm: move NTLM_NEEDS_NSS_INIT define into core NTLM header,
gnunet <=
- [GNUnet-SVN] [gnurl] 142/256: schannel: return CURLE_SSL_CACERT on failed verification, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 122/256: runtests.pl: Apply strippart to upload too., gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 180/256: travis: add build without HTTP/SMTP/IMAP, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 113/256: unit1301: fix error message on first test, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 214/256: mime: fix an explicit null dereference (#1899), gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 194/256: tests: enable gssapi in travis-ci linux build, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 168/256: vtls: fix memory corruption, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 170/256: OpenSSL: fix yet another mistake while encapsulating SSL backend data, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 206/256: cookies: reject oversized cookies, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 176/256: ossfuzz: add some more handled CURL options, gnunet, 2017/10/06