Commit 184c3e2d authored by Dan Fandrich's avatar Dan Fandrich
Browse files

configure: Fix the --disable-crypto-auth option 

It now disables NTLM and GSS authentication methods, and produces
compilable code when SSL is enabled.
parent b04c158a

configure.ac

+3 −1
Original line number Diff line number Diff line
@@ -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

lib/curl_setup.h

+4 −2
Original line number Diff line number Diff line
@@ -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