tests: prefer `--insecure` over `-k`

To make it uniform in all tests, and greppability.

Also:
- replace `-k` flag with `-q` in test 1268. (the actual flag doesn't
  matter in this test)
- keep `-k` in test 300 to test its short form.
  (also verified to fail without a working `-k`)

Closes #16878

diff --git a/tests/data/test1112 b/tests/data/test1112
index 5e03509b0515354fabee5805518e0311d2626069..0790d0352ba62d8051ed9b0869be9420e0a02dde 100644 (file)
--- a/tests/data/test1112
+++ b/tests/data/test1112
@@ -91,7 +91,7 @@ ftps
 FTPS download with strict timeout and slow data transfer
 </name>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 5
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -m 5
 </command>
 </client>
 

diff --git a/tests/data/test1268 b/tests/data/test1268
index 15b15b56e9fbf4b301cf18925e9325430f4d6bcc..a3fb2bc41a78ea6a696645a426d50ccb1dbe1178 100644 (file)
--- a/tests/data/test1268
+++ b/tests/data/test1268
@@ -23,13 +23,13 @@ UnixSockets
 filename argument looks like a flag
 </name>
 <command>
---stderr %LOGDIR/moo%TESTNUMBER --unix-socket -k hej://moo
+--stderr %LOGDIR/moo%TESTNUMBER --unix-socket -q hej://moo
 </command>
 </client>
 
 <verify>
 <file name="%LOGDIR/moo%TESTNUMBER" mode="text">
-Warning: The filename argument '-k' looks like a flag.
+Warning: The filename argument '-q' looks like a flag.
 curl: (1) Protocol "hej" not supported
 </file>
 

diff --git a/tests/data/test1272 b/tests/data/test1272
index 921242892730c60f22330394f0096f3d45c27887..41fc3ef76f8eed56cacd2637d152cda6f1fb06c2 100644 (file)
--- a/tests/data/test1272
+++ b/tests/data/test1272
@@ -29,7 +29,7 @@ gophers
 Gophers index
 </name>
 <command>
--k gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER
+--insecure gophers://%HOSTIP:%GOPHERSPORT/1/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test1470 b/tests/data/test1470
index 1c9389a4cce29d59386eb5d0f30adf87445baacf..5c3d74343441cff915f10dbcde3b1e069d2d5d5c 100644 (file)
--- a/tests/data/test1470
+++ b/tests/data/test1470
@@ -44,7 +44,7 @@ socks5unix
 HTTPS GET with host name using SOCKS5h via Unix sockets
 </name>
 <command>
-https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER -k --proxy socks5h://localhost%SOCKSUNIXPATH
+https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER --insecure --proxy socks5h://localhost%SOCKSUNIXPATH
 </command>
 </client>
 

diff --git a/tests/data/test1561 b/tests/data/test1561
index 7dbce1108b18ab52aa08357518ca5eb3dc1340c5..1341d12130ce1c357f0135df6da70b34b72ad25e 100644 (file)
--- a/tests/data/test1561
+++ b/tests/data/test1561
@@ -72,7 +72,7 @@ https
 Cookies set over HTTP can't override secure ones
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com"
+--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com"  http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com"
 </command>
 </client>
 <verify>

diff --git a/tests/data/test1562 b/tests/data/test1562
index b9755aa2488d8ed19245f164055d35ebc38ee9ae..88e442f7b20ad7a8a5dca977045db24cbaac891f 100644 (file)
--- a/tests/data/test1562
+++ b/tests/data/test1562
@@ -44,7 +44,7 @@ https
 Expire secure cookies over HTTPS
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001
+--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -H "Host: www.example.com" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0002 -b "non-existing" https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001
 </command>
 </client>
 <verify>

diff --git a/tests/data/test2400 b/tests/data/test2400
index ef7b126691513db4d74cecd1976b202d58f57280..9d53f68b96c5ff4d92de2c2fcb94254120cb0e84 100644 (file)
--- a/tests/data/test2400
+++ b/tests/data/test2400
@@ -41,7 +41,7 @@ HTTP/2 GET over HTTPS
 <setenv>
 </setenv>
 <command>
--k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
+--insecure --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
 </command>
 
 </client>

diff --git a/tests/data/test2401 b/tests/data/test2401
index 9929c1394b44400be569902e27b60267ea9dc456..8f686e850333c6335e4cbd3376a4f1fbfe223b1d 100644 (file)
--- a/tests/data/test2401
+++ b/tests/data/test2401
@@ -38,7 +38,7 @@ HTTP/2 POST over HTTPS
 <setenv>
 </setenv>
 <command>
--k --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" -d "moo"
+--insecure --http2 "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER" -d "moo"
 </command>
 
 </client>

diff --git a/tests/data/test2403 b/tests/data/test2403
index 222f236d712f80b5a6a7bfcaf2c2aabbf83e8e81..5901866265cbbf991b0c2ae09c9174c2daeba8d6 100644 (file)
--- a/tests/data/test2403
+++ b/tests/data/test2403
@@ -42,7 +42,7 @@ HTTP/2 GET using %{header_json}
 <setenv>
 </setenv>
 <command>
--k --http2 -w '%{header_json}\n' "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
+--insecure --http2 -w '%{header_json}\n' "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
 </command>
 
 </client>

diff --git a/tests/data/test2406 b/tests/data/test2406
index 6bf4fa8cd961c368430aac5be475e39153b41091..bc6cc41ad28d5378d7e4f012000505ad72b10599 100644 (file)
--- a/tests/data/test2406
+++ b/tests/data/test2406
@@ -40,7 +40,7 @@ HTTP/2 over HTTPS with -f
 <setenv>
 </setenv>
 <command>
--k --http2 -f "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
+--insecure --http2 -f "https://%HOSTIP:%HTTP2TLSPORT/%TESTNUMBER"
 </command>
 
 </client>

diff --git a/tests/data/test2501 b/tests/data/test2501
index 1f35372f1b09811a88cd4a74c159d3462cc670ba..d05395754d551786000520cfd2f28d82bd34472a 100644 (file)
--- a/tests/data/test2501
+++ b/tests/data/test2501
@@ -38,7 +38,7 @@ HTTP/3 POST
 <setenv>
 </setenv>
 <command>
--k --http3 "https://%HOSTIP:%HTTP3PORT/%TESTNUMBER" -d "moo"
+--insecure --http3 "https://%HOSTIP:%HTTP3PORT/%TESTNUMBER" -d "moo"
 </command>
 
 </client>

diff --git a/tests/data/test300 b/tests/data/test300
index 2eb5f11a6fe0cd2fc2523ffdb3798e6d4d14fd73..3dbf0f01d9c9122d7dcbdbc89a4d83f703ba90a4 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -31,6 +31,7 @@ https
 <name>
 simple HTTPS GET
 </name>
+# Using '-k' over '--insecure' to also test the short form
 <command>
 -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>

diff --git a/tests/data/test301 b/tests/data/test301
index a073011819a9d0e52372431264799e41c3b1da1e..a195958988a7e63616e5a66eab8d9c4d1144943b 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -33,7 +33,7 @@ https
 HTTPS GET with user and password
 </name>
 <command>
--k -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
+--insecure -u fake:user https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test302 b/tests/data/test302
index f6f33c276c3e3da75cc79daf41b618ba368a6c58..3f235b201bb2c7604eb4335dc826d16f474188c3 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -33,7 +33,7 @@ https
 HTTPS GET over HTTP proxy fails
 </name>
 <command>
--k -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER
+--insecure -U fake:user -x %HOSTIP:%HTTPPORT https://bad.fakeurl-to.test:%TESTNUMBER/slash/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test303 b/tests/data/test303
index 9b656a7951cb3225fca3e5927deeda28e2ae5b92..f2aad9dfb74e79f2f44d4404862f9b3522b133dd 100644 (file)
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -37,7 +37,7 @@ https
 HTTPS with 8 secs timeout
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8
+--insecure https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER -m 8
 </command>
 </client>
 

diff --git a/tests/data/test304 b/tests/data/test304
index f5ba5153c340ac1023abf66b011f06e9805eb775..2283192e22322f334a42168eb775890fbd573676 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -31,7 +31,7 @@ https
 HTTPS multipart formpost
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
+--insecure https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt
 </command>
 # We create this file before the command is invoked!
 <file name="%LOGDIR/test%TESTNUMBER.txt">

diff --git a/tests/data/test306 b/tests/data/test306
index 463558e5ee281ce18009ba76be187b3793851bec..e0b5f907520019303925ab327a822ecdd2a4fcfc 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -45,7 +45,7 @@ https
 HTTPS GET, receive no headers only data!
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9
+--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --http0.9
 </command>
 </client>
 

diff --git a/tests/data/test307 b/tests/data/test307
index 475fdaee3112cf8e71a3509f7a6e3812d70e2a1f..650daaea1c175426798728d345efaf89486770be 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -36,7 +36,7 @@ https
 simple HTTPS GET with openssl engine
 </name>
 <command>
---engine openssl -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
+--engine openssl --insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test308 b/tests/data/test308
index 39803d3b028445196e6bb7950df26e21d4092247..cdcbf7cb45ccf988db6a4aea5f955699a9b0b6c1 100644 (file)
--- a/tests/data/test308
+++ b/tests/data/test308
@@ -21,7 +21,7 @@ https
 simple HTTPS GET with invalid crypto engine
 </name>
 <command>
---engine invalid-crypto-engine-xyzzy -k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
+--engine invalid-crypto-engine-xyzzy --insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test309 b/tests/data/test309
index 29b3e30619c4adb0b2658c5491936afc43bd1e0c..29058d4c966524f7b9623aab09d079ac37261e19 100644 (file)
--- a/tests/data/test309
+++ b/tests/data/test309
@@ -59,7 +59,7 @@ https
 HTTP Location: redirect to HTTPS URL
 </name>
 <command>
--k http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
+--insecure http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L
 </command>
 </client>
 

diff --git a/tests/data/test325 b/tests/data/test325
index 0baed5c04ab0636f95e05aec88a50cc248a364d7..4f5826252043c3490fc8360cd5e1fd021d49d801 100644 (file)
--- a/tests/data/test325
+++ b/tests/data/test325
@@ -42,7 +42,7 @@ https
 HTTPS with attempted redirect to denied HTTP
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location
+--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER --proto-redir -http --location
 </command>
 </client>
 

diff --git a/tests/data/test364 b/tests/data/test364
index 0e2ccd15147dc62d5f46774be16a2544fa0355af..5a02d702274165266ff0498cc8d58d01e55150e7 100644 (file)
--- a/tests/data/test364
+++ b/tests/data/test364
@@ -28,7 +28,7 @@ https
 HTTPS PUT of small file
 </name>
 <command>
--k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
+--insecure https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 <file name="%LOGDIR/test%TESTNUMBER.txt">
 %repeat[200 x banana]%

diff --git a/tests/data/test400 b/tests/data/test400
index e20774a4d04d639ee4c4d329ba83bdcaee64f4f1..47fdd49e3ea71ed57ff3ab2dd2caec6fc84c8d84 100644 (file)
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -38,7 +38,7 @@ ftps
 FTPS dir list PASV unencrypted data
 </name>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>
 

diff --git a/tests/data/test401 b/tests/data/test401
index 5124447d841e6ff24379341e72cde126a810e477..8ff16a5c0dded0510ca436be35a2f0b5083918b3 100644 (file)
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test402 b/tests/data/test402
index 86283749a4dbeea0f42caf9a9313d857a8cde9e5..a62267dd1523bbc4543bdda26cd78455c2c2dece 100644 (file)
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -19,7 +19,7 @@ ftp
 FTP SSL required on non-SSL server
 </name>
 <command>
--k --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
+--insecure --ftp-ssl-reqd ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test403 b/tests/data/test403
index 7c08d5ca865d5a9e4b56a139b22915bfdab1eb2b..f451bf8f4335c24b81a789aa2a214926a7ff4afa 100644 (file)
--- a/tests/data/test403
+++ b/tests/data/test403
@@ -40,7 +40,7 @@ ftps
 FTPS with CCC not supported by server
 </name>
 <command>
--k --ftp-ssl-control --ftp-ssl-ccc ftps://%HOSTIP:%FTPSPORT/
+--insecure --ftp-ssl-control --ftp-ssl-ccc ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>
 

diff --git a/tests/data/test405 b/tests/data/test405
index 90369b8ade0bc09b1074bb05c5924fde67d0acdd..c39bb3aef1ed65cf93d04fc5e20dd52e1399e994 100644 (file)
--- a/tests/data/test405
+++ b/tests/data/test405
@@ -19,7 +19,7 @@ ftp
 FTPS operation to FTP port
 </name>
 <command>
--m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
+-m 5 --insecure ftps://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test406 b/tests/data/test406
index db497bf6c4a2be21b7544d3ee711c93a9b77033e..9cd5047d85e77efec74ea72c600922b958c735f2 100644 (file)
--- a/tests/data/test406
+++ b/tests/data/test406
@@ -38,7 +38,7 @@ ftps
 FTPS dir list, PORT with specified IP
 </name>
 <command>
--k --ftp-ssl-control -P %CLIENTIP ftps://%HOSTIP:%FTPSPORT/
+--insecure --ftp-ssl-control -P %CLIENTIP ftps://%HOSTIP:%FTPSPORT/
 </command>
 </client>
 

diff --git a/tests/data/test407 b/tests/data/test407
index 8b35a9f2b3218f003fa59bd9cb07b079b4300365..33a07cd126940bf7a77331a8bcfb2ba3509cb11d 100644 (file)
--- a/tests/data/test407
+++ b/tests/data/test407
@@ -29,7 +29,7 @@ ftps
 Get two FTPS files from the same remote dir: no second CWD
 </name>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER ftps://%HOSTIP:%FTPSPORT/a/path/%TESTNUMBER
 </command>
 <stdout>
 data blobb

diff --git a/tests/data/test408 b/tests/data/test408
index 594eb01aa73863c571b57537812b96cd238b2e2f..13c9c51179c28d99b9799cdcd655de8f5137033e 100644 (file)
--- a/tests/data/test408
+++ b/tests/data/test408
@@ -25,7 +25,7 @@ ftps
 FTPS PORT upload with CWD
 </name>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P -
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P -
 </command>
 <file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo

diff --git a/tests/data/test409 b/tests/data/test409
index a1f902933238535c73fb9e6746abf27a59414547..f7a014248c824453470864fb873e40f516153aa4 100644 (file)
--- a/tests/data/test409
+++ b/tests/data/test409
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
 <command>
--k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
+--insecure --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test410 b/tests/data/test410
index 79d12def6838a3e188ecd975d6f7a4368c901447..f947fcdc1d4f9fec77c5303bb072adb154eacff2 100644 (file)
--- a/tests/data/test410
+++ b/tests/data/test410
@@ -36,7 +36,7 @@ HTTPS GET with very long request header
 Long: %repeat[3500 x header content]%
 </file>
 <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER
+--insecure https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test414 b/tests/data/test414
index 391ed0d06e18600320fe781c957b3e9828681064..8a697ae125c6f45032291083c8820a11d458108a 100644 (file)
--- a/tests/data/test414
+++ b/tests/data/test414
@@ -55,7 +55,7 @@ https
 HTTPS sec-cookie, HTTP redirect, same name cookie, redirect back
 </name>
 <command>
-https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER -k -c %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPSPORT:%HOSTIP --resolve attack.invalid:%HTTPPORT:%HOSTIP -L
+https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER --insecure -c %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPSPORT:%HOSTIP --resolve attack.invalid:%HTTPPORT:%HOSTIP -L
 </command>
 </client>
 

diff --git a/tests/data/test445 b/tests/data/test445
index 4e12367d837e921126b9eb9c19d8e0fc72883b30..d573077b1510996732d14fb38a363b9a2d7395ad 100644 (file)
--- a/tests/data/test445
+++ b/tests/data/test445
@@ -46,7 +46,7 @@ http-proxy
 Refuse tunneling protocols through HTTP proxy
 </name>
 <command>
--x http://%HOSTIP:%PROXYPORT/%TESTNUMBER -p gopher://127.0.0.1 dict://127.0.0.1 http://moo https://example telnet://another ftp://yes ftps://again imap://more ldap://perhaps mqtt://yes pop3://mail rtsp://harder scp://copy sftp://files smb://wird smtp://send -k
+-x http://%HOSTIP:%PROXYPORT/%TESTNUMBER -p gopher://127.0.0.1 dict://127.0.0.1 http://moo https://example telnet://another ftp://yes ftps://again imap://more ldap://perhaps mqtt://yes pop3://mail rtsp://harder scp://copy sftp://files smb://wird smtp://send --insecure
 </command>
 </client>
 

diff --git a/tests/data/test474 b/tests/data/test474
index 37e0805b5e888872c024bdc2280853e20d04acf2..fc5575d71b8fba1926d2544b85c9f01c8295acd4 100644 (file)
--- a/tests/data/test474
+++ b/tests/data/test474
@@ -38,7 +38,7 @@ https
 -w urle.scheme after HTTP to HTTPS redirect
 </name>
 <command option="no-include">
--k -L http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_redirects} %{url_effective} %{urle.scheme}\n"
+--insecure -L http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_redirects} %{url_effective} %{urle.scheme}\n"
 </command>
 </client>
 

diff --git a/tests/data/test628 b/tests/data/test628
index a1407e4a85ef56760c242f76721ca2a0d1aa010c..b010d0304524167648561f5ac29902ff2aeee2eb 100644 (file)
--- a/tests/data/test628
+++ b/tests/data/test628
@@ -16,7 +16,7 @@ sftp
 SFTP invalid user login (password authentication)
 </name>
 <command>
--u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file  --insecure
+-u not-a-valid-user: sftp://%HOSTIP:%SSHPORT%SSH_PWD/irrelevant-file --insecure
 </command>
 </client>
 

diff --git a/tests/data/test780 b/tests/data/test780
index 567b6684d08bcedd09a798c5f224478fbeabde9d..f65f793c7d093423f4bbe8f477a270886b044dfb 100644 (file)
--- a/tests/data/test780
+++ b/tests/data/test780
@@ -53,7 +53,7 @@ this.hsts.example "99991001 04:47:41"
 HSTS with updated expiry in response
 </name>
 <command>
--x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -k
+-x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
 </command>
 <disable>
 test-duphandle

diff --git a/tests/data/test781 b/tests/data/test781
index 4892415bf46b4b3c7cab7f186fd5a3e7fdf101c9..20db3852bc8146dc67a92417ad133dad5ba5b54d 100644 (file)
--- a/tests/data/test781
+++ b/tests/data/test781
@@ -55,7 +55,7 @@ this.hsts.example "99991001 04:47:41"
 HSTS update expiry, with parent includeSubDomains domain present
 </name>
 <command>
--x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -k
+-x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
 </command>
 <disable>
 test-duphandle

diff --git a/tests/data/test782 b/tests/data/test782
index 6a53081ab66aa2c1a1daedbd02ca602fdf78742d..61b4a0b8c27eae75a80dcededc1dadbde5c95484 100644 (file)
--- a/tests/data/test782
+++ b/tests/data/test782
@@ -55,7 +55,7 @@ CURL_TIME=1728465947
 HSTS update expiry, with two includeSubDomains domains present
 </name>
 <command>
--x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -k
+-x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
 </command>
 <disable>
 test-duphandle

diff --git a/tests/data/test783 b/tests/data/test783
index f12cc4507d5b1bf2501375fb8fcf3f0d8e7ae425..1f888738ed1785255b71c7316add86b8f07ccf31 100644 (file)
--- a/tests/data/test783
+++ b/tests/data/test783
@@ -55,7 +55,7 @@ CURL_TIME=1728465947
 HSTS update expiry, removing includesubdomains in update
 </name>
 <command>
--x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -k
+-x http://%HOSTIP:%PROXYPORT http://this.hsts.example:%HTTPSPORT/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER --insecure
 </command>
 <disable>
 test-duphandle

diff --git a/tests/data/test987 b/tests/data/test987
index bf926b7fe25b8f56671bdfff8f1a03112079fd07..ae69b8de87617abfcac35806167d12a82d00a7d6 100644 (file)
--- a/tests/data/test987
+++ b/tests/data/test987
@@ -26,7 +26,7 @@ To: another
 body\r
 </stdin>
 <command>
--k --ssl-reqd --mail-rcpt recipient@example.com --mail-from sender@example.com -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER
+--insecure --ssl-reqd --mail-rcpt recipient@example.com --mail-from sender@example.com -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test988 b/tests/data/test988
index 31e1c8711b62a021e42f27368278da35487a7271..46b09fff94d6b76d8bc71034c5129c1c3fa1b536 100644 (file)
--- a/tests/data/test988
+++ b/tests/data/test988
@@ -30,7 +30,7 @@ imaps
 IMAPS FETCH with redundant explicit SSL request
 </name>
 <command>
--k --ssl-reqd -u '"user:sec"ret{' 'imaps://%HOSTIP:%IMAPSPORT/%TESTNUMBER/;MAILINDEX=1'
+--insecure --ssl-reqd -u '"user:sec"ret{' 'imaps://%HOSTIP:%IMAPSPORT/%TESTNUMBER/;MAILINDEX=1'
 </command>
 </client>
 

diff --git a/tests/data/test989 b/tests/data/test989
index fa41240a20cb0961b2d95816de69ad88c64660ad..c7bf2494604f1981383b9382533f15ec0a7efb21 100644 (file)
--- a/tests/data/test989
+++ b/tests/data/test989
@@ -30,7 +30,7 @@ pop3s
 POP3S RETR with redundant explicit SSL request
 </name>
 <command>
--k --ssl-reqd  -u user:secret pop3s://%HOSTIP:%POP3SPORT/%TESTNUMBER
+--insecure --ssl-reqd  -u user:secret pop3s://%HOSTIP:%POP3SPORT/%TESTNUMBER
 </command>
 </client>