969ec949a8
This fixes the following security problems: CVE-2016-0754: remote file name path traversal in curl tool for Windows http://curl.haxx.se/docs/adv_20160127A.html CVE-2016-0755: NTLM credentials not-checked for proxy connection re-use http://curl.haxx.se/docs/adv_20160127B.html Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48614
25 lines
808 B
Diff
25 lines
808 B
Diff
--- a/lib/curl_ntlm_msgs.c
|
|
+++ b/lib/curl_ntlm_msgs.c
|
|
@@ -569,7 +569,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
|
|
@@ -921,9 +921,9 @@ CURLcode Curl_ssl_md5sum(unsigned char *
|
|
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;
|