tests: Made the crypto test feature usable

This feature specifies the availability of cryptographic
authentication, which can be disabled at compile-time

diff --git a/docs/INSTALL b/docs/INSTALL
index d1b2881c2a940975ab06ce6e0ebeb1589c52958c..f002c2800663a88ab022667fa8c458bf99000e90 100644 (file)
--- 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 9a87d6e8b800c473cf49ad96a6cc0a9c8287eaab..aabbec91609f5280ba6e03be1cd9fa207cd07ba1 100644 (file)
--- 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 04c18f91a577fb457487374edd61e1b5dfe9d67d..829444ce069bf22a07c920ca1cfcca5e31789ab0 100644 (file)
--- 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 0f294d4cf5cfe71a3600bcdf5a40613cb7997bd4..f9d6e364564552a4942b56200d713e24bc33b150 100644 (file)
--- 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 4f5220a2640145691482b6c92db898bf1be2991b..851b188768facb5d9235f0981702bd97def3976e 100644 (file)
--- 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 a974fc5cb04c11b2513e2bfd447656137a20bb5f..3ae702bce3d44ac0756381ed5677dc87e082f1d6 100644 (file)
Binary files a/tests/data/test552 and b/tests/data/test552 differ

diff --git a/tests/data/test565 b/tests/data/test565
index b8d12b45c686e7acf67dafea36c4c3fdfe039cf0..e93ee3e1aba22b3ded54f7e2c806398698035264 100644 (file)
--- 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 11c81a428789c40e6b27d15d77ac2e79b82634cf..adbb3dd22854f3b8791a61d5646488a1b14f8c9f 100644 (file)
--- 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 8a47d5853ac6e10f7a22b2fea100ff984e1aaddd..cbd40e7d96a48e0358b847ed977754810ccb9cb6 100755 (executable)
--- 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"));