diff --git a/CHANGES b/CHANGES index 521480d9095aba2647b41103213995159d31543f..cb3349415a587efca2f54fa6e9d6211e0fee2242 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,11 @@ Changelog +Dan F (9 March 2007) +- Updated the test harness to add a new "crypto" feature check and updated the + appropriate test case to use it. For now, this is treated the same as the + "SSL" feature because curl doesn't list it separately. + Daniel (9 March 2007) - Robert Iakobashvili fixed CURLOPT_INTERFACE for IPv6. diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT index 398915a706769ebb0674369519afe4cf74ffaaf6..29900e8df9e01362185677a5f623b9e31671b345 100644 --- a/tests/FILEFORMAT +++ b/tests/FILEFORMAT @@ -135,6 +135,7 @@ A list of features that MUST be present in the client/library for this test to be able to run (if these features are not present, the test will be SKIPPED). Features testable here are: +crypto getrlimit GnuTLS idn diff --git a/tests/data/test153 b/tests/data/test153 index aef165ef3d00ffb090544101d54ff6c147731fe0..38dc1d28dc5dd101b15c05f3462db889599a7e74 100644 --- a/tests/data/test153 +++ b/tests/data/test153 @@ -54,6 +54,9 @@ This IS the second real page! http + +crypto + HTTP with Digest authorization with stale=true diff --git a/tests/data/test154 b/tests/data/test154 index 5a79be38012b9411cc8f3518292a29301053b1c4..cae98ed619014e3f1d9401f02149b149c9908a91 100644 --- a/tests/data/test154 +++ b/tests/data/test154 @@ -53,6 +53,9 @@ This IS the real page! http + +crypto + HTTP PUT with --anyauth authorization (picking Digest) diff --git a/tests/data/test167 b/tests/data/test167 index 1667f3f8e3f5bea9180c791c184f94727eea8c3c..a83dc61bda886b2e406678c75b79d9af0c55f5d3 100644 --- a/tests/data/test167 +++ b/tests/data/test167 @@ -32,6 +32,9 @@ Nice auth sir! http + +crypto + HTTP with proxy-requiring-Basic to site-requiring-Digest diff --git a/tests/data/test168 b/tests/data/test168 index d867099ae8f58b87919995f4ea18c289c3e35784..b1fc97967bfb516b3d1651ca366d09260dc1c6c5 100644 --- a/tests/data/test168 +++ b/tests/data/test168 @@ -46,6 +46,9 @@ Nice auth sir! http + +crypto + HTTP with proxy-requiring-Digest to site-requiring-Digest diff --git a/tests/data/test175 b/tests/data/test175 index c793a2e1b49cca13709b709526b6b1a23ecb6638..e25b5b9010739a3c0ccf59dfda6a99fe7200ea64 100644 --- a/tests/data/test175 +++ b/tests/data/test175 @@ -41,6 +41,9 @@ content for you http + +crypto + HTTP POST --digest to server not requiring any auth at all diff --git a/tests/data/test177 b/tests/data/test177 index 79a4e51d58377df1c12ebdc8e9f874db45d67681..2e48712077d249266f9a2d98494a06962a38f8f9 100644 --- a/tests/data/test177 +++ b/tests/data/test177 @@ -16,6 +16,9 @@ Content-Type: text/html; charset=iso-8859-1 http + +crypto + HTTP POST --digest to server doing a 302-location response diff --git a/tests/data/test206 b/tests/data/test206 index a2b7034b7405515c30ed1e05c8617a7577ae2fb9..21f72377592a671826dc43b885cdf66c5998137a 100644 --- a/tests/data/test206 +++ b/tests/data/test206 @@ -53,6 +53,9 @@ daniel http + +crypto + HTTP proxy CONNECT auth Digest diff --git a/tests/data/test245 b/tests/data/test245 index ffefb219bce45ea73817a040fe67266e458f9e2f..7ee0e7c44af0541a90b9f78a32ddc00ae1d7ac67 100644 --- a/tests/data/test245 +++ b/tests/data/test245 @@ -41,6 +41,9 @@ ok http + +crypto + HTTP POST --digest diff --git a/tests/data/test246 b/tests/data/test246 index 72e27b998f1e9dfa786354fed91605d0ce57b6a6..b0b4e55e79f7c8fe22a08d8e307953439d5fbab9 100644 --- a/tests/data/test246 +++ b/tests/data/test246 @@ -51,6 +51,9 @@ ok http + +crypto + HTTP POST --digest with server doing a 100 before 401 response diff --git a/tests/data/test258 b/tests/data/test258 index 1a839d8a2a01cf2f4cc11ddd131bcd700467ad0c..f45572b90d5ec0b8efcc8761b6779fd34f8d4d51 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -53,6 +53,9 @@ ok http + +crypto + HTTP POST multipart without Expect: header using proxy anyauth (Digest) diff --git a/tests/data/test259 b/tests/data/test259 index 9d8627245287453ed5f67fe5fa575ed53b01608a..ab369ff83f33d68e81c5d78d11870064fc070e20 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -50,6 +50,9 @@ ok http + +crypto + HTTP POST multipart with Expect: header using proxy anyauth (Digest) diff --git a/tests/data/test273 b/tests/data/test273 index 626107951f8db58d24fc46f9e5451592e299dd1d..8f0dca83bef285faac1cbdf77edf207d229252b3 100644 --- a/tests/data/test273 +++ b/tests/data/test273 @@ -51,6 +51,9 @@ This IS the real page! http + +crypto + HTTP with two Digest authorization headers diff --git a/tests/data/test64 b/tests/data/test64 index 4add34789181bb036174bdcea88b97e7312c0356..c7896829de320bfdbf6ed1b761a4fe87f4d7f8e5 100644 --- a/tests/data/test64 +++ b/tests/data/test64 @@ -51,6 +51,9 @@ This IS the real page! http + +crypto + HTTP with Digest authorization diff --git a/tests/data/test65 b/tests/data/test65 index 097c58afd9c573f11708678569a49a1050ab641b..8cc2d1e395af473a270fda0f9562f8b56078b59b 100644 --- a/tests/data/test65 +++ b/tests/data/test65 @@ -51,6 +51,9 @@ This is not the real page either http + +crypto + HTTP with Digest authorization with bad password diff --git a/tests/data/test72 b/tests/data/test72 index 77f2b22852e7163a327e55a9570a01eaf3cdfba0..b3096d54c60a35a6881a3a96067a84f33f6ecee6 100644 --- a/tests/data/test72 +++ b/tests/data/test72 @@ -53,6 +53,9 @@ This IS the real page! http + +crypto + HTTP with Digest *OR* Basic authorization diff --git a/tests/data/test88 b/tests/data/test88 index fd7bc94cabd816b19277326007d9bee13c58c69d..c3ab6695a597ed78111f401a49a3ed1d53c2834c 100644 --- a/tests/data/test88 +++ b/tests/data/test88 @@ -55,6 +55,9 @@ This IS the real page! http + +crypto + HTTP PUT with Digest authorization diff --git a/tests/runtests.pl b/tests/runtests.pl index 5fb45b1719ba0a9045933cd0ca7106bf953f0bd4..53e4cd4e5499607665228b926adac15a129592c7 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -144,6 +144,7 @@ my $has_ntlm; # set if libcurl is built with NTLM support my $has_openssl; # set if libcurl is built with OpenSSL my $has_gnutls; # set if libcurl is built with GnuTLS my $has_nss; # set if libcurl is built with NSS +my $has_crypto; # set if libcurl is built with cryptographic support my $has_textaware; # set if running on a system that has a text mode concept # on files. Windows for example my @protocols; # array of supported protocols @@ -1044,6 +1045,9 @@ sub checksystem { if($feat =~ /SSL/i) { # ssl enabled $ssl_version=1; + # curl doesn't list cryptographic support separately, so treat + # it the same as SSL for the time being + $has_crypto=1; } if($feat =~ /Largefile/i) { # large file support @@ -1292,6 +1296,11 @@ sub singletest { next; } } + elsif($f eq "crypto") { + if($has_crypto) { + next; + } + } # See if this "feature" is in the list of supported protocols elsif (grep /^$f$/, @protocols) { next;