From 01aaad744246be645d3cfb514536ca9386baea69 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Sat, 28 Dec 2013 20:22:22 +0000 Subject: [PATCH] tests: Disabled NTLM tests when running with SSPI enabled --- tests/data/test1008 | 1 + tests/data/test1021 | 1 + tests/data/test1097 | 1 + tests/data/test1100 | 1 + tests/data/test1215 | 1 + tests/data/test150 | 1 + tests/data/test155 | 1 + tests/data/test159 | 1 + tests/data/test162 | 1 + tests/data/test169 | 1 + tests/data/test170 | 1 + tests/data/test176 | 1 + tests/data/test2025 | 1 + tests/data/test2028 | 1 + tests/data/test2029 | 1 + tests/data/test2030 | 1 + tests/data/test2031 | 1 + tests/data/test2032 | 1 + tests/data/test2033 | 1 + tests/data/test209 | 1 + tests/data/test213 | 1 + tests/data/test239 | 1 + tests/data/test243 | 1 + tests/data/test265 | 1 + tests/data/test267 | 1 + tests/data/test547 | 1 + tests/data/test548 | 1 + tests/data/test555 | 1 + tests/data/test590 | 1 + tests/data/test67 | 1 + tests/data/test68 | 1 + tests/data/test69 | 1 + tests/data/test81 | 1 + tests/data/test822 | 1 + tests/data/test827 | 1 + tests/data/test831 | 1 + tests/data/test834 | 1 + tests/data/test868 | 1 + tests/data/test873 | 1 + tests/data/test877 | 1 + tests/data/test880 | 1 + tests/data/test89 | 1 + tests/data/test90 | 1 + tests/data/test906 | 1 + tests/data/test91 | 1 + tests/data/test921 | 1 + tests/data/test933 | 1 + tests/data/test936 | 1 + 48 files changed, 48 insertions(+) diff --git a/tests/data/test1008 b/tests/data/test1008 index 30714f9af..7635a12aa 100644 --- a/tests/data/test1008 +++ b/tests/data/test1008 @@ -85,6 +85,7 @@ http NTLM +!SSPI HTTP proxy CONNECT auth NTLM with chunked-encoded 407 response diff --git a/tests/data/test1021 b/tests/data/test1021 index 81127249a..7c3efec84 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -91,6 +91,7 @@ http NTLM +!SSPI HTTP proxy CONNECT with any proxyauth and proxy offers NTLM and close diff --git a/tests/data/test1097 b/tests/data/test1097 index b899810d0..3b733a55a 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -47,6 +47,7 @@ https NTLM +!SSPI HTTP POST using CONNECT with --proxy-ntlm but no auth is required diff --git a/tests/data/test1100 b/tests/data/test1100 index e38c0e0d7..ae694514e 100644 --- a/tests/data/test1100 +++ b/tests/data/test1100 @@ -63,6 +63,7 @@ This is the final page ! NTLM +!SSPI http diff --git a/tests/data/test1215 b/tests/data/test1215 index ea62eeb60..6c27f8082 100644 --- a/tests/data/test1215 +++ b/tests/data/test1215 @@ -58,6 +58,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test150 b/tests/data/test150 index cdd4cf673..44d2052d5 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -50,6 +50,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test155 b/tests/data/test155 index 70ac7fd2f..c4fe9ea12 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -75,6 +75,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test159 b/tests/data/test159 index 1f8a2f887..c0cbe06af 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test162 b/tests/data/test162 index 9b75f7c6b..828c2a5e6 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -27,6 +27,7 @@ isn't because there's no Proxy-Authorization: NTLM header NTLM +!SSPI http diff --git a/tests/data/test169 b/tests/data/test169 index f7419e6d0..22930a142 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -77,6 +77,7 @@ http NTLM +!SSPI HTTP with proxy-requiring-NTLM to site-requiring-Digest diff --git a/tests/data/test170 b/tests/data/test170 index a2c221792..f0e596b79 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -19,6 +19,7 @@ http NTLM +!SSPI HTTP POST with --proxy-ntlm and no SSL with no response diff --git a/tests/data/test176 b/tests/data/test176 index 413c14925..ed0c946e8 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -47,6 +47,7 @@ content for you NTLM +!SSPI http diff --git a/tests/data/test2025 b/tests/data/test2025 index 4c8df18ad..03b6b1417 100644 --- a/tests/data/test2025 +++ b/tests/data/test2025 @@ -195,6 +195,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2028 b/tests/data/test2028 index 793ad3e36..2a03836b3 100644 --- a/tests/data/test2028 +++ b/tests/data/test2028 @@ -231,6 +231,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2029 b/tests/data/test2029 index 7b8a5e2c7..7c697e3d4 100644 --- a/tests/data/test2029 +++ b/tests/data/test2029 @@ -168,6 +168,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2030 b/tests/data/test2030 index 8de81d094..a80c15ece 100644 --- a/tests/data/test2030 +++ b/tests/data/test2030 @@ -220,6 +220,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2031 b/tests/data/test2031 index 19f75335c..0df841b77 100644 --- a/tests/data/test2031 +++ b/tests/data/test2031 @@ -234,6 +234,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2032 b/tests/data/test2032 index 128deab95..30b7f72a5 100644 --- a/tests/data/test2032 +++ b/tests/data/test2032 @@ -90,6 +90,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test2033 b/tests/data/test2033 index fd097e6f7..df9ac357e 100644 --- a/tests/data/test2033 +++ b/tests/data/test2033 @@ -91,6 +91,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test209 b/tests/data/test209 index d8bd8bd24..96dd60ce9 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -75,6 +75,7 @@ http NTLM +!SSPI HTTP proxy CONNECT auth NTLM diff --git a/tests/data/test213 b/tests/data/test213 index 5c14aa875..3e9f67885 100644 --- a/tests/data/test213 +++ b/tests/data/test213 @@ -75,6 +75,7 @@ http NTLM +!SSPI HTTP 1.0 proxy CONNECT auth NTLM and then POST diff --git a/tests/data/test239 b/tests/data/test239 index 2748100fb..af65e3150 100644 --- a/tests/data/test239 +++ b/tests/data/test239 @@ -52,6 +52,7 @@ http NTLM +!SSPI HTTP proxy-auth NTLM and then POST diff --git a/tests/data/test243 b/tests/data/test243 index d53a43798..c96ab7cad 100644 --- a/tests/data/test243 +++ b/tests/data/test243 @@ -73,6 +73,7 @@ http NTLM +!SSPI HTTP POST with --proxy-anyauth, picking NTLM diff --git a/tests/data/test265 b/tests/data/test265 index 07de45547..255fd4808 100644 --- a/tests/data/test265 +++ b/tests/data/test265 @@ -78,6 +78,7 @@ http NTLM +!SSPI HTTP proxy CONNECT auth NTLM and then POST, response-body in the 407 diff --git a/tests/data/test267 b/tests/data/test267 index 479031c46..c58b82dca 100644 --- a/tests/data/test267 +++ b/tests/data/test267 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test547 b/tests/data/test547 index 7bcf5a4d4..95e3638b9 100644 --- a/tests/data/test547 +++ b/tests/data/test547 @@ -76,6 +76,7 @@ lib547 NTLM +!SSPI HTTP proxy auth NTLM with POST data from read callback diff --git a/tests/data/test548 b/tests/data/test548 index a6e2a9bf2..888908aa2 100644 --- a/tests/data/test548 +++ b/tests/data/test548 @@ -76,6 +76,7 @@ lib548 NTLM +!SSPI HTTP proxy auth NTLM with POST data from CURLOPT_POSTFIELDS diff --git a/tests/data/test555 b/tests/data/test555 index bf06b524d..a6635d49a 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -81,6 +81,7 @@ lib555 NTLM +!SSPI HTTP proxy auth NTLM with POST data from read callback multi-if diff --git a/tests/data/test590 b/tests/data/test590 index f50664d8f..171ec0d20 100644 --- a/tests/data/test590 +++ b/tests/data/test590 @@ -74,6 +74,7 @@ lib590 NTLM +!SSPI HTTP proxy offers Negotiate+NTLM, use only NTLM diff --git a/tests/data/test67 b/tests/data/test67 index bfe6edd26..709ce7d1f 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test68 b/tests/data/test68 index 10b4429c3..6460f5d5f 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -55,6 +55,7 @@ Wrong password dude. Get it fixed and return. NTLM +!SSPI http diff --git a/tests/data/test69 b/tests/data/test69 index 441aed7e8..85ab657be 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -72,6 +72,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test81 b/tests/data/test81 index 0da0bdca0..a3f738134 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -55,6 +55,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test822 b/tests/data/test822 index 6451b841a..4d6214824 100644 --- a/tests/data/test822 +++ b/tests/data/test822 @@ -34,6 +34,7 @@ imap NTLM +!SSPI IMAP NTLM authentication diff --git a/tests/data/test827 b/tests/data/test827 index 2171363e4..a59ae1775 100644 --- a/tests/data/test827 +++ b/tests/data/test827 @@ -34,6 +34,7 @@ imap NTLM +!SSPI IMAP NTLM authentication with initial response diff --git a/tests/data/test831 b/tests/data/test831 index ae93cc581..72aee1274 100644 --- a/tests/data/test831 +++ b/tests/data/test831 @@ -26,6 +26,7 @@ imap NTLM +!SSPI IMAP NTLM graceful cancellation diff --git a/tests/data/test834 b/tests/data/test834 index f90c3b491..71dcc0b92 100644 --- a/tests/data/test834 +++ b/tests/data/test834 @@ -36,6 +36,7 @@ imap NTLM +!SSPI IMAP NTLM authentication with SASL downgrade diff --git a/tests/data/test868 b/tests/data/test868 index 0e495e958..8568bc6c7 100644 --- a/tests/data/test868 +++ b/tests/data/test868 @@ -36,6 +36,7 @@ pop3 NTLM +!SSPI POP3 NTLM authentication diff --git a/tests/data/test873 b/tests/data/test873 index 8cdb0899a..167669a42 100644 --- a/tests/data/test873 +++ b/tests/data/test873 @@ -35,6 +35,7 @@ pop3 NTLM +!SSPI POP3 NTLM authentication with initial response diff --git a/tests/data/test877 b/tests/data/test877 index b17a3eec4..cd20b6fd7 100644 --- a/tests/data/test877 +++ b/tests/data/test877 @@ -27,6 +27,7 @@ pop3 NTLM +!SSPI POP3 NTLM graceful cancellation diff --git a/tests/data/test880 b/tests/data/test880 index 9857bad94..27036465f 100644 --- a/tests/data/test880 +++ b/tests/data/test880 @@ -38,6 +38,7 @@ pop3 NTLM +!SSPI POP3 NTLM authentication with SASL downgrade diff --git a/tests/data/test89 b/tests/data/test89 index f348eb658..4b0c4ae4b 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -89,6 +89,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test90 b/tests/data/test90 index 24a7ff4d2..e311ada75 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -127,6 +127,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test906 b/tests/data/test906 index 9e85dc52a..8e0711428 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -26,6 +26,7 @@ smtp NTLM +!SSPI SMTP NTLM authentication diff --git a/tests/data/test91 b/tests/data/test91 index e6f34aedf..90110ff9d 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -73,6 +73,7 @@ Finally, this is the real page! NTLM +!SSPI http diff --git a/tests/data/test921 b/tests/data/test921 index ffcecd9cf..eb1246001 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -25,6 +25,7 @@ smtp NTLM +!SSPI SMTP NTLM authentication with initial response diff --git a/tests/data/test933 b/tests/data/test933 index 1b06aedad..e52c8f90f 100644 --- a/tests/data/test933 +++ b/tests/data/test933 @@ -26,6 +26,7 @@ smtp NTLM +!SSPI SMTP NTLM graceful cancellation diff --git a/tests/data/test936 b/tests/data/test936 index 19bbd0e89..cbc6fb96d 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -28,6 +28,7 @@ smtp NTLM +!SSPI SMTP NTLM authentication with SASL downgrade