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 9fca722c891780031f1328b41f242be93a764d86..a1ef0dd7a9b9f574a5e1ceac388ba38ef41390ca 100644 (file)
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -86,6 +86,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test1021 b/tests/data/test1021
index 689341d601d5db78aa56366ba5bd9da621833776..84d1e62a73db39eb06d3eb7ca8387b17a3773f7f 100644 (file)
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -91,6 +91,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test1097 b/tests/data/test1097
index 7eb7b5f3d2e7e5976ecdd29d16a2e0bcd9de6942..70a89908deeafaad8ee9d3588d514982fceed5c6 100644 (file)
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -45,6 +45,7 @@ https
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test1100 b/tests/data/test1100
index d60a93a77d255647ce5fbc9f5aea1d71c000b850..101b1e7acc0dc4e5e3d672cd4b43855e0b849115 100644 (file)
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -63,6 +63,7 @@ This is the final page !
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test1215 b/tests/data/test1215
index 8edfd9b4e2c8959b7f8756e17fe638686ca6b29f..ed50da0b80d15a4a9b3999bc2645b7ded6e6e9de 100644 (file)
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -58,6 +58,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test150 b/tests/data/test150
index f28be04641a5f549e58ddd0bf62281cde8b87ced..e9fde393bd185b4a8307ee5a7e37f530158d9b5c 100644 (file)
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -57,6 +57,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test155 b/tests/data/test155
index 0a2bb0fa215afdffc16e50b4f007a3f1cbbbe746..0cfd10eeadea5073f6999c771b9126de70a8bad8 100644 (file)
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -76,6 +76,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test159 b/tests/data/test159
index 5a062176e65e5b57f5fb7f7dc827f29653de72c6..a56986fbaf284326a12e129fcba4f01dd1003a2f 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -43,6 +43,7 @@ This is not the real page either!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test162 b/tests/data/test162
index 099641a8709d32de3419323dc0011a691c62c38c..29791d9af84bd4393fdd7f0a6361c737da7925ac 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -27,6 +27,7 @@ isn't because there's no Proxy-Authorization: NTLM header
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 proxy
 </features>

diff --git a/tests/data/test169 b/tests/data/test169
index 8013bcc17f2c77512279cfde792a6c5cfb15307e..209dd9d90b129a1998dea84f009d048a0e713f87 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -77,6 +77,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test170 b/tests/data/test170
index 49d595bbc453ee2044ba2d7924ec367975457692..9b41ddd7feb1e84824008f48cca0a45b87c0648d 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -19,6 +19,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 proxy
 </features>

diff --git a/tests/data/test176 b/tests/data/test176
index 73c53ca878eb8ffb2d885826f1a89eed4c7aceef..e18837af1fdf1c56b240f3c10be5b8cca26f4bb6 100644 (file)
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -48,6 +48,7 @@ content for you
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2025 b/tests/data/test2025
index 6dfc70a7d2401d324c384ff13ae73a7f29c719e6..282c698501f77f3965b95218cd030f58ff94f3b0 100644 (file)
--- a/tests/data/test2025
+++ b/tests/data/test2025
@@ -195,6 +195,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2028 b/tests/data/test2028
index 2042eecf16a8c583598ac905dc973bc35fe80bb7..92a6371616156d8bc0ebaa8ea997e9ef294b1e48 100644 (file)
--- a/tests/data/test2028
+++ b/tests/data/test2028
@@ -231,6 +231,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2029 b/tests/data/test2029
index 82d80857b69468842c83b9ab745577af7d80c190..59a793ebe27eccdecbf0ac150e5b5a36db6fafd5 100644 (file)
--- a/tests/data/test2029
+++ b/tests/data/test2029
@@ -168,6 +168,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2030 b/tests/data/test2030
index 893f986f7f8b3cff23956265f7a1e499ff0fb011..a158a907a94cb003684f80f9aab237d9d04d22a4 100644 (file)
--- a/tests/data/test2030
+++ b/tests/data/test2030
@@ -220,6 +220,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2031 b/tests/data/test2031
index 9799621348862b6e28731cdd1aa0bef42048f1c9..9acfeef72d2ff29224a5e1b85d4df94566abbe9c 100644 (file)
--- a/tests/data/test2031
+++ b/tests/data/test2031
@@ -234,6 +234,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2032 b/tests/data/test2032
index ec5771f8141b48c24b4c50e08ac08b7d3607bb8e..8200b8de5d561c8ecd29090002b498a71ce7f950 100644 (file)
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -66,6 +66,7 @@ Data connection 2: 402
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test2033 b/tests/data/test2033
index a13c1d42540ebf2c533e246ed9dcc735cf5a58c3..5293b66e85d1ac67a3be1a00cb47eb77e7258ddf 100644 (file)
--- a/tests/data/test2033
+++ b/tests/data/test2033
@@ -67,6 +67,7 @@ Data connection 2: 402
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
 <server>

diff --git a/tests/data/test209 b/tests/data/test209
index aded6d2d2eea1b1bafb0200849fc8d3ea22ed405..67a7fc513de75ffa6759c1f67771cc393607cdb6 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -77,6 +77,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test213 b/tests/data/test213
index 82d82c483e1582484751077bce3b326d91b264c2..e6d7cd55abc28107d87349bb73cec35c6c373d31 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -77,6 +77,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test239 b/tests/data/test239
index a6f1fd59bc32658f9144a0497bfad3ec3ebbdbcd..b6f387933d9ee660a50c90196d03d7b994e57f3a 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -52,6 +52,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test243 b/tests/data/test243
index f83218e14689c3173a3c65e3954db2de78dda56e..f7b2386b52c32b3ed8dac821eb50ceacbf0f4cc5 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -73,6 +73,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test265 b/tests/data/test265
index ff7d5945e9c1a970fdc1ecb6a703dc0b8c10ef47..a27633afcca3504c47d6f5927275872b9287dd9b 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -78,6 +78,7 @@ http
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test267 b/tests/data/test267
index 06b662c91b7ba038ef9cd960e4bb02394e2cea2a..a0c3d33c62772cb76af55c3ccf3d28f4cff6daba 100644 (file)
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -56,6 +56,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test547 b/tests/data/test547
index 781799b11766aca637fce2f0c8e06fcf4eeb239c..e4ec398935deab0e80cba22819136d5fe47a1c5d 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -76,6 +76,7 @@ lib547
 </tool>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test548 b/tests/data/test548
index fa98cd437c782bd320bad1bc7c493936c541f138..d636ab1b613fc68b6338bc31a0b3c04ab349c46f 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -76,6 +76,7 @@ lib548
 </tool>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test555 b/tests/data/test555
index d4b946614801d551a80d443520928fc0579e553d..ed8117f8fa2d38a3aef93033cab665027c51ee7f 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -81,6 +81,7 @@ lib555
 </tool>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test590 b/tests/data/test590
index 6f6250763ca6d7cd23b4f54dc864039952ecf263..5ddc823a56b2b6e973675dbd0d9e4fc66f174147 100644 (file)
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -74,6 +74,7 @@ lib590
 </tool>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test67 b/tests/data/test67
index 1c64a2f514e9dec9d663419053d3db27c22b6dbe..c0ccaf8f8e95557735cbc57a219b7842ade43b1b 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -56,6 +56,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test68 b/tests/data/test68
index 91d16ade67f05ec0f07f856fa2746cd1ed694433..1eaff6e7d35aac5c4cebd8f7f52e11ae23be660a 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -55,6 +55,7 @@ Wrong password dude. Get it fixed and return.
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test69 b/tests/data/test69
index 7af662f6e1225b2a764f6049b1b582dab01078c6..309f0394af36af1cf8cc41ab9ff087d5a5a50a80 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -72,6 +72,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test81 b/tests/data/test81
index 4cc03975e5438a01c43574aa980a6cda139f609a..29e558d9c42ae79f6e55bc738582cc6057dd3195 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -55,6 +55,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 proxy

diff --git a/tests/data/test822 b/tests/data/test822
index 5fea05ba84f0a2e5a6cf4755d73e69d9e99208e4..aa264edd6bb8c120eb7702ffc270d2f77d2e6d38 100644 (file)
--- a/tests/data/test822
+++ b/tests/data/test822
@@ -35,6 +35,7 @@ imap
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test827 b/tests/data/test827
index d2711211206faf367b7392f9dc56014e8ff3d680..9cefb5005378d76707a35759f0ba556e7f3ac854 100644 (file)
--- a/tests/data/test827
+++ b/tests/data/test827
@@ -36,6 +36,7 @@ imap
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test831 b/tests/data/test831
index fdcae29c145c0fea7296409fd55d96d03fcf0f10..eae10f048e98178d4433f628b1ff676d830951a4 100644 (file)
--- a/tests/data/test831
+++ b/tests/data/test831
@@ -28,6 +28,7 @@ imap
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test834 b/tests/data/test834
index 35ab06aff5a0e27ff8cb84abe25a2e547682f180..8ecc22322d9d2a3f8cbf48b8c0b5f96570bda33a 100644 (file)
--- a/tests/data/test834
+++ b/tests/data/test834
@@ -39,6 +39,7 @@ imap
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test868 b/tests/data/test868
index fc0589251876ff84b6175ad6b1679c620c636a9c..2fa2405adf6e47eb4015e39b3aff7d45544fec3b 100644 (file)
--- a/tests/data/test868
+++ b/tests/data/test868
@@ -37,6 +37,7 @@ pop3
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test873 b/tests/data/test873
index 9c068dcb47a1c95e5fe890bfd4a8b96a075e2161..2cabf1f63e243aa7c5552fe67e41ad17ffe81955 100644 (file)
--- a/tests/data/test873
+++ b/tests/data/test873
@@ -37,6 +37,7 @@ pop3
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test877 b/tests/data/test877
index c4775942ff7a9967ac21209015be5148a432d442..114707aad1804e46619734525466e094b896ce33 100644 (file)
--- a/tests/data/test877
+++ b/tests/data/test877
@@ -29,6 +29,7 @@ pop3
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test880 b/tests/data/test880
index 738817cd36467e6670041751956cb3d04d9da956..e0609bbdc4fd6b60b1fbaab35e37fd3872e45e7c 100644 (file)
--- a/tests/data/test880
+++ b/tests/data/test880
@@ -41,6 +41,7 @@ pop3
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test89 b/tests/data/test89
index 65b96dbca04e623e719d7fd39811ad905d5e1e32..fc620cb236729cdd603ea12c4092de0e5623172c 100644 (file)
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -89,6 +89,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test90 b/tests/data/test90
index 1c8f13944695102fe12a62be301129247140bc24..d40b5a57118283628d2b1ccef1216988b6233852 100644 (file)
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -127,6 +127,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test906 b/tests/data/test906
index c038f7fe1226546c99691a764ec3c855bbd289b9..6ec59c7b1a143fd1e786ed489aa9ee4420963f75 100644 (file)
--- a/tests/data/test906
+++ b/tests/data/test906
@@ -27,6 +27,7 @@ smtp
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test91 b/tests/data/test91
index d5406559333184eee1040dca9a4f4735e50c235d..4942bfddfe82442f96b7efb9f55ebee53175e00a 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -73,6 +73,7 @@ Finally, this is the real page!
 <client>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test921 b/tests/data/test921
index 577102706c117499000076cef74e8065e6f3e5ef..f9e56736daa23675c85efb3f5ee6c7f090b2c676 100644 (file)
--- a/tests/data/test921
+++ b/tests/data/test921
@@ -27,6 +27,7 @@ smtp
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 debug
 </features>

diff --git a/tests/data/test933 b/tests/data/test933
index 08b4e9dd00110ca8825fd5eade46c6cf0d8ae2ab..e091de3956bacd585e005a052f010678b1f622f6 100644 (file)
--- a/tests/data/test933
+++ b/tests/data/test933
@@ -28,6 +28,7 @@ smtp
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>

diff --git a/tests/data/test936 b/tests/data/test936
index 5fde3c96725cb2a0ebc78e74e2704b8f8364f9ce..b12349968e6d3eb040fe1fc601b8be9a1b75092e 100644 (file)
--- a/tests/data/test936
+++ b/tests/data/test936
@@ -31,6 +31,7 @@ smtp
 </server>
 <features>
 NTLM
+SSL
 !SSPI
 </features>
  <name>