diff --git a/docs/CURL-DISABLE.md b/docs/CURL-DISABLE.md index 3aa9608f8..5967d7b79 100644 --- a/docs/CURL-DISABLE.md +++ b/docs/CURL-DISABLE.md @@ -12,6 +12,10 @@ Disable support for HTTP cookies. Disable support for authentication methods using crypto. +## CURL_DISABLE_NTLM + +Disable support for NTLM. + ## CURL_DISABLE_DICT Disable the DICT protocol diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 8911b05e2..dc46373be 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -56,6 +56,9 @@ /* to disable LDAPS */ #define CURL_DISABLE_LDAPS 1 +/* to disable NTLM authentication */ +#define CURL_DISABLE_NTLM 1 + /* to disable proxies */ /* #undef CURL_DISABLE_PROXY */ diff --git a/lib/curl_setup.h b/lib/curl_setup.h index be4a58d4b..0b575ef78 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -644,24 +644,20 @@ int netware_init(void); #endif /* Single point where USE_NTLM definition might be defined */ -#ifndef CURL_DISABLE_CRYPTO_AUTH -#if defined(USE_OPENSSL) || defined(USE_MBEDTLS) || \ - defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_SECTRANSP) || \ - defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) || \ - (defined(USE_WOLFSSL) && defined(HAVE_WOLFSSL_DES_ECB_ENCRYPT)) - -#define USE_CURL_NTLM_CORE - -# if defined(USE_MBEDTLS) -/* Get definition of MBEDTLS_MD4_C */ -# include +#if !defined(CURL_DISABLE_CRYPTO_AUTH) && !defined(CURL_DISABLE_NTLM) +# if defined(USE_OPENSSL) || defined(USE_MBEDTLS) || \ + defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_SECTRANSP) || \ + defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) || \ + (defined(USE_WOLFSSL) && defined(HAVE_WOLFSSL_DES_ECB_ENCRYPT)) +# define USE_CURL_NTLM_CORE +# if defined(USE_MBEDTLS) + /* Get definition of MBEDTLS_MD4_C */ +# include +# endif +# endif +# if defined(USE_CURL_NTLM_CORE) || defined(USE_WINDOWS_SSPI) +# define USE_NTLM # endif - -#endif - -#if defined(USE_CURL_NTLM_CORE) || defined(USE_WINDOWS_SSPI) -#define USE_NTLM -#endif #endif #ifdef CURL_WANTS_CA_BUNDLE_ENV diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index fbcb4d0dd..07d3fb089 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -278,9 +278,15 @@ $write cvh "#ifdef CURL_DISABLE_LIBCURL_OPTION" $write cvh "#undef CURL_DISABLE_LIBCURL_OPTION" $write cvh "#endif" $write cvh "#ifndef __VAX" +$write cvh "#ifdef CURL_DISABLE_NTLM" +$write cvh "#undef CURL_DISABLE_NTLM" +$write cvh "#endif" $write cvh "#else" $! NTLM needs long long or int64 support, missing from DECC C. $write cvh "#ifdef __DECC +$write cvh "#ifndef CURL_DISABLE_NTLM" +$write cvh "#define CURL_DISABLE_NTLM 1" +$write cvh "#endif" $write cvh "#endif" $write cvh "#endif" $write cvh "#ifdef CURL_DISABLE_POP3"