From: Jay Satiro Date: Sun, 29 Dec 2019 20:23:25 +0000 (-0500) Subject: tests: Change NTLM tests to require SSL X-Git-Tag: curl-7_68_0~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9603c8299f135cb670261d0af58825274d0dfdae;p=thirdparty%2Fcurl.git tests: Change NTLM tests to require SSL Prior to this change tests that required NTLM feature did not require SSL feature. There are pending changes to cmake builds that will allow enabling NTLM in non-SSL builds in Windows. In that case the NTLM auth strings created are different from what is expected by the NTLM tests and they fail: "The issue with NTLM is that previous non-SSL builds would not enable NTLM and so the NTLM tests would be skipped." Assisted-by: marc-groundctl@users.noreply.github.com Ref: https://github.com/curl/curl/pull/4717#issuecomment-566218729 Closes https://github.com/curl/curl/pull/4768 --- diff --git a/tests/data/test1008 b/tests/data/test1008 index 9fca722c89..a1ef0dd7a9 100644 --- a/tests/data/test1008 +++ b/tests/data/test1008 @@ -86,6 +86,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test1021 b/tests/data/test1021 index 689341d601..84d1e62a73 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -91,6 +91,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test1097 b/tests/data/test1097 index 7eb7b5f3d2..70a89908de 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -45,6 +45,7 @@ https NTLM +SSL !SSPI diff --git a/tests/data/test1100 b/tests/data/test1100 index d60a93a77d..101b1e7acc 100644 --- a/tests/data/test1100 +++ b/tests/data/test1100 @@ -63,6 +63,7 @@ This is the final page ! NTLM +SSL !SSPI debug diff --git a/tests/data/test1215 b/tests/data/test1215 index 8edfd9b4e2..ed50da0b80 100644 --- a/tests/data/test1215 +++ b/tests/data/test1215 @@ -58,6 +58,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test150 b/tests/data/test150 index f28be04641..e9fde393bd 100644 --- a/tests/data/test150 +++ b/tests/data/test150 @@ -57,6 +57,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test155 b/tests/data/test155 index 0a2bb0fa21..0cfd10eead 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -76,6 +76,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test159 b/tests/data/test159 index 5a062176e6..a56986fbaf 100644 --- a/tests/data/test159 +++ b/tests/data/test159 @@ -43,6 +43,7 @@ This is not the real page either! NTLM +SSL !SSPI debug diff --git a/tests/data/test162 b/tests/data/test162 index 099641a870..29791d9af8 100644 --- a/tests/data/test162 +++ b/tests/data/test162 @@ -27,6 +27,7 @@ isn't because there's no Proxy-Authorization: NTLM header NTLM +SSL !SSPI proxy diff --git a/tests/data/test169 b/tests/data/test169 index 8013bcc17f..209dd9d90b 100644 --- a/tests/data/test169 +++ b/tests/data/test169 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test170 b/tests/data/test170 index 49d595bbc4..9b41ddd7fe 100644 --- a/tests/data/test170 +++ b/tests/data/test170 @@ -19,6 +19,7 @@ http NTLM +SSL !SSPI proxy diff --git a/tests/data/test176 b/tests/data/test176 index 73c53ca878..e18837af1f 100644 --- a/tests/data/test176 +++ b/tests/data/test176 @@ -48,6 +48,7 @@ content for you NTLM +SSL !SSPI diff --git a/tests/data/test2025 b/tests/data/test2025 index 6dfc70a7d2..282c698501 100644 --- a/tests/data/test2025 +++ b/tests/data/test2025 @@ -195,6 +195,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2028 b/tests/data/test2028 index 2042eecf16..92a6371616 100644 --- a/tests/data/test2028 +++ b/tests/data/test2028 @@ -231,6 +231,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2029 b/tests/data/test2029 index 82d80857b6..59a793ebe2 100644 --- a/tests/data/test2029 +++ b/tests/data/test2029 @@ -168,6 +168,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2030 b/tests/data/test2030 index 893f986f7f..a158a907a9 100644 --- a/tests/data/test2030 +++ b/tests/data/test2030 @@ -220,6 +220,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2031 b/tests/data/test2031 index 9799621348..9acfeef72d 100644 --- a/tests/data/test2031 +++ b/tests/data/test2031 @@ -234,6 +234,7 @@ Finally, this is the real page! NTLM +SSL !SSPI diff --git a/tests/data/test2032 b/tests/data/test2032 index ec5771f814..8200b8de5d 100644 --- a/tests/data/test2032 +++ b/tests/data/test2032 @@ -66,6 +66,7 @@ Data connection 2: 402 NTLM +SSL !SSPI diff --git a/tests/data/test2033 b/tests/data/test2033 index a13c1d4254..5293b66e85 100644 --- a/tests/data/test2033 +++ b/tests/data/test2033 @@ -67,6 +67,7 @@ Data connection 2: 402 NTLM +SSL !SSPI diff --git a/tests/data/test209 b/tests/data/test209 index aded6d2d2e..67a7fc513d 100644 --- a/tests/data/test209 +++ b/tests/data/test209 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test213 b/tests/data/test213 index 82d82c483e..e6d7cd55ab 100644 --- a/tests/data/test213 +++ b/tests/data/test213 @@ -77,6 +77,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test239 b/tests/data/test239 index a6f1fd59bc..b6f387933d 100644 --- a/tests/data/test239 +++ b/tests/data/test239 @@ -52,6 +52,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test243 b/tests/data/test243 index f83218e146..f7b2386b52 100644 --- a/tests/data/test243 +++ b/tests/data/test243 @@ -73,6 +73,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test265 b/tests/data/test265 index ff7d5945e9..a27633afcc 100644 --- a/tests/data/test265 +++ b/tests/data/test265 @@ -78,6 +78,7 @@ http NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test267 b/tests/data/test267 index 06b662c91b..a0c3d33c62 100644 --- a/tests/data/test267 +++ b/tests/data/test267 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test547 b/tests/data/test547 index 781799b117..e4ec398935 100644 --- a/tests/data/test547 +++ b/tests/data/test547 @@ -76,6 +76,7 @@ lib547 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test548 b/tests/data/test548 index fa98cd437c..d636ab1b61 100644 --- a/tests/data/test548 +++ b/tests/data/test548 @@ -76,6 +76,7 @@ lib548 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test555 b/tests/data/test555 index d4b9466148..ed8117f8fa 100644 --- a/tests/data/test555 +++ b/tests/data/test555 @@ -81,6 +81,7 @@ lib555 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test590 b/tests/data/test590 index 6f6250763c..5ddc823a56 100644 --- a/tests/data/test590 +++ b/tests/data/test590 @@ -74,6 +74,7 @@ lib590 NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test67 b/tests/data/test67 index 1c64a2f514..c0ccaf8f8e 100644 --- a/tests/data/test67 +++ b/tests/data/test67 @@ -56,6 +56,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test68 b/tests/data/test68 index 91d16ade67..1eaff6e7d3 100644 --- a/tests/data/test68 +++ b/tests/data/test68 @@ -55,6 +55,7 @@ Wrong password dude. Get it fixed and return. NTLM +SSL !SSPI debug diff --git a/tests/data/test69 b/tests/data/test69 index 7af662f6e1..309f0394af 100644 --- a/tests/data/test69 +++ b/tests/data/test69 @@ -72,6 +72,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test81 b/tests/data/test81 index 4cc03975e5..29e558d9c4 100644 --- a/tests/data/test81 +++ b/tests/data/test81 @@ -55,6 +55,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug proxy diff --git a/tests/data/test822 b/tests/data/test822 index 5fea05ba84..aa264edd6b 100644 --- a/tests/data/test822 +++ b/tests/data/test822 @@ -35,6 +35,7 @@ imap NTLM +SSL !SSPI debug diff --git a/tests/data/test827 b/tests/data/test827 index d271121120..9cefb50053 100644 --- a/tests/data/test827 +++ b/tests/data/test827 @@ -36,6 +36,7 @@ imap NTLM +SSL !SSPI debug diff --git a/tests/data/test831 b/tests/data/test831 index fdcae29c14..eae10f048e 100644 --- a/tests/data/test831 +++ b/tests/data/test831 @@ -28,6 +28,7 @@ imap NTLM +SSL !SSPI diff --git a/tests/data/test834 b/tests/data/test834 index 35ab06aff5..8ecc22322d 100644 --- a/tests/data/test834 +++ b/tests/data/test834 @@ -39,6 +39,7 @@ imap NTLM +SSL !SSPI diff --git a/tests/data/test868 b/tests/data/test868 index fc05892518..2fa2405adf 100644 --- a/tests/data/test868 +++ b/tests/data/test868 @@ -37,6 +37,7 @@ pop3 NTLM +SSL !SSPI debug diff --git a/tests/data/test873 b/tests/data/test873 index 9c068dcb47..2cabf1f63e 100644 --- a/tests/data/test873 +++ b/tests/data/test873 @@ -37,6 +37,7 @@ pop3 NTLM +SSL !SSPI debug diff --git a/tests/data/test877 b/tests/data/test877 index c4775942ff..114707aad1 100644 --- a/tests/data/test877 +++ b/tests/data/test877 @@ -29,6 +29,7 @@ pop3 NTLM +SSL !SSPI diff --git a/tests/data/test880 b/tests/data/test880 index 738817cd36..e0609bbdc4 100644 --- a/tests/data/test880 +++ b/tests/data/test880 @@ -41,6 +41,7 @@ pop3 NTLM +SSL !SSPI diff --git a/tests/data/test89 b/tests/data/test89 index 65b96dbca0..fc620cb236 100644 --- a/tests/data/test89 +++ b/tests/data/test89 @@ -89,6 +89,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test90 b/tests/data/test90 index 1c8f139446..d40b5a5711 100644 --- a/tests/data/test90 +++ b/tests/data/test90 @@ -127,6 +127,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test906 b/tests/data/test906 index c038f7fe12..6ec59c7b1a 100644 --- a/tests/data/test906 +++ b/tests/data/test906 @@ -27,6 +27,7 @@ smtp NTLM +SSL !SSPI debug diff --git a/tests/data/test91 b/tests/data/test91 index d540655933..4942bfddfe 100644 --- a/tests/data/test91 +++ b/tests/data/test91 @@ -73,6 +73,7 @@ Finally, this is the real page! NTLM +SSL !SSPI debug diff --git a/tests/data/test921 b/tests/data/test921 index 577102706c..f9e56736da 100644 --- a/tests/data/test921 +++ b/tests/data/test921 @@ -27,6 +27,7 @@ smtp NTLM +SSL !SSPI debug diff --git a/tests/data/test933 b/tests/data/test933 index 08b4e9dd00..e091de3956 100644 --- a/tests/data/test933 +++ b/tests/data/test933 @@ -28,6 +28,7 @@ smtp NTLM +SSL !SSPI diff --git a/tests/data/test936 b/tests/data/test936 index 5fde3c9672..b12349968e 100644 --- a/tests/data/test936 +++ b/tests/data/test936 @@ -31,6 +31,7 @@ smtp NTLM +SSL !SSPI