aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2014-02-17 09:40:49 +0100
committerDan Fandrich <dan@coneharvesters.com>2014-02-17 09:50:46 +0100
commit184c3e2d3767ed06c3d2f995a4b98e4ce2c7548f (patch)
treea8186736b0db77fda0e8af62bc60cbef80843298
parentb04c158adfe535aca5ac19bae288dca80be6dbb4 (diff)
configure: Fix the --disable-crypto-auth option
It now disables NTLM and GSS authentication methods, and produces compilable code when SSL is enabled.
-rw-r--r--configure.ac4
-rw-r--r--lib/curl_setup.h6
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index dd309345d..9dc68664f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3249,6 +3249,7 @@ AC_HELP_STRING([--disable-crypto-auth],[Disable cryptographic authentication]),
no)
AC_MSG_RESULT(no)
AC_DEFINE(CURL_DISABLE_CRYPTO_AUTH, 1, [to disable cryptographic authentication])
+ CURL_DISABLE_CRYPTO_AUTH=1
;;
*) AC_MSG_RESULT(yes)
;;
@@ -3382,7 +3383,8 @@ fi
if test "x$USE_WINDOWS_SSPI" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI"
fi
-if test "x$CURL_DISABLE_HTTP" != "x1"; then
+if test "x$CURL_DISABLE_HTTP" != "x1" -a \
+ "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then
if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
-o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \
-o "x$DARWINSSL_ENABLED" = "x1"; then
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 62ea92199..4e18d670b 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -601,12 +601,14 @@ int netware_init(void);
#define USE_SSL /* SSL support has been enabled */
#endif
-#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
+#if !defined(CURL_DISABLE_CRYPTO_AUTH) && \
+ (defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI))
#define USE_HTTP_NEGOTIATE
#endif
/* Single point where USE_NTLM definition might be done */
-#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM)
+#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_NTLM) && \
+ !defined(CURL_DISABLE_CRYPTO_AUTH)
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || \
defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL)
#define USE_NTLM