diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-29 16:52:15 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-29 16:52:15 +0000 |
| commit | 82dabab00dc2c07d77d5c8fb2a82c443728a2724 (patch) | |
| tree | 55cdc7bf5a6f200168967f7551fe3891e0695def /package | |
| parent | a28d74d014cbc4e496b6dc3ffca6f355197a1bc5 (diff) | |
| download | upstream-82dabab00dc2c07d77d5c8fb2a82c443728a2724.tar.gz upstream-82dabab00dc2c07d77d5c8fb2a82c443728a2724.tar.bz2 upstream-82dabab00dc2c07d77d5c8fb2a82c443728a2724.zip | |
curl: fix build with --disable-crypto-auth (#18838)
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44192 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch new file mode 100644 index 0000000000..3f88861e54 --- /dev/null +++ b/package/network/utils/curl/patches/300-fix-disable-crypto-auth.patch @@ -0,0 +1,25 @@ +--- a/lib/curl_ntlm_msgs.c ++++ b/lib/curl_ntlm_msgs.c +@@ -571,7 +571,7 @@ CURLcode Curl_sasl_create_ntlm_type3_mes + else + #endif + +-#if USE_NTRESPONSES && USE_NTLM2SESSION ++#if USE_NTRESPONSES && USE_NTLM2SESSION && !defined(CURL_DISABLE_CRYPTO_AUTH) + /* We don't support NTLM2 if we don't have USE_NTRESPONSES */ + if(ntlm->flags & NTLMFLAG_NEGOTIATE_NTLM2_KEY) { + unsigned char ntbuffer[0x18]; +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -835,9 +835,9 @@ void Curl_ssl_md5sum(unsigned char *tmp, + unsigned char *md5sum, /* output */ + size_t md5len) + { +-#ifdef curlssl_md5sum ++#if defined(curlssl_md5sum) + curlssl_md5sum(tmp, tmplen, md5sum, md5len); +-#else ++#elif !defined(CURL_DISABLE_CRYPTO_AUTH) + MD5_context *MD5pw; + + (void) md5len; |