aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/INSTALL1
-rw-r--r--tests/data/test10013
-rw-r--r--tests/data/test10023
-rw-r--r--tests/data/test11153
-rw-r--r--tests/data/test5511
-rw-r--r--tests/data/test552bin143232 -> 143239 bytes
-rw-r--r--tests/data/test5653
-rw-r--r--tests/data/test5793
-rwxr-xr-xtests/runtests.pl6
9 files changed, 15 insertions, 8 deletions
diff --git a/docs/INSTALL b/docs/INSTALL
index d1b2881c2..f002c2800 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -1026,7 +1026,6 @@ REDUCING SIZE
command line. Following is a list of appropriate key words:
--disable-cookies !cookies
- --disable-crypto-auth !HTTP\ Digest\ auth !HTTP\ proxy\ Digest\ auth
--disable-manual !--manual
--disable-proxy !HTTP\ proxy !proxytunnel !SOCKS4 !SOCKS5
diff --git a/tests/data/test1001 b/tests/data/test1001
index 9a87d6e8b..aabbec916 100644
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -63,6 +63,9 @@ ok
<server>
http
</server>
+<features>
+crypto
+</features>
<name>
HTTP POST --digest with PUT and resumed upload and modified method
</name>
diff --git a/tests/data/test1002 b/tests/data/test1002
index 04c18f91a..829444ce0 100644
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -62,6 +62,9 @@ ok
<server>
http
</server>
+<features>
+crypto
+</features>
<name>
HTTP POST --digest with PUT and resumed upload and modified method, twice
</name>
diff --git a/tests/data/test1115 b/tests/data/test1115
index 0f294d4cf..f9d6e3645 100644
--- a/tests/data/test1115
+++ b/tests/data/test1115
@@ -29,9 +29,6 @@ Content-Length: 0
<server>
http
</server>
-<features>
-crypto
-</features>
<name>
HTTP GET with unexpected 1xx response
</name>
diff --git a/tests/data/test551 b/tests/data/test551
index 4f5220a26..851b18876 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -61,6 +61,7 @@ http
lib547
</tool>
<features>
+crypto
</features>
<name>
HTTP proxy auth Digest with POST data from read callback
diff --git a/tests/data/test552 b/tests/data/test552
index a974fc5cb..3ae702bce 100644
--- a/tests/data/test552
+++ b/tests/data/test552
Binary files differ
diff --git a/tests/data/test565 b/tests/data/test565
index b8d12b45c..e93ee3e1a 100644
--- a/tests/data/test565
+++ b/tests/data/test565
@@ -56,6 +56,9 @@ ok
<server>
http
</server>
+<features>
+crypto
+</features>
# tool is what to use instead of 'curl'
<tool>
lib565
diff --git a/tests/data/test579 b/tests/data/test579
index 11c81a428..adbb3dd22 100644
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -56,6 +56,9 @@ ok
<server>
http
</server>
+<features>
+crypto
+</features>
# tool is what to use instead of 'curl'
<tool>
lib579
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 8a47d5853..cbd40e7d9 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -2403,6 +2403,8 @@ sub checksystem {
if($feat =~ /NTLM/i) {
# NTLM enabled
$has_ntlm=1;
+ # Use this as a proxy for any cryptographic authentication
+ $has_crypto=1;
}
if($feat =~ /NTLM_WB/i) {
# NTLM delegation to winbind daemon ntlm_auth helper enabled
@@ -2513,10 +2515,6 @@ sub checksystem {
$has_shared = `sh $CURLCONFIG --built-shared`;
chomp $has_shared;
- # curl doesn't list cryptographic support separately, so assume it's
- # always available
- $has_crypto=1;
-
my $hostname=join(' ', runclientoutput("hostname"));
my $hosttype=join(' ', runclientoutput("uname -a"));