updated for the new SSL -k

added two new tests to test the absense of -k to insecure SSL sites

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a9504be39d6c6687150411b9be8ae22b0db5b190..c849d91e78a38b2523c4df4f49dc06584c2957ec 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -16,5 +16,4 @@ test105  test114  test123  test19   test24   test302  test43   test31 \
 test106  test115  test124  test190  test25   test303  test44   test38 \
 test107  test116  test125  test2    test26   test33   test45   test126 \
 test304  test39   test32   test128  test48 \
-test130  test131  test132  test133  test134 test135
-
+test130  test131  test132  test133  test134 test135 test403 test305

diff --git a/tests/data/test300 b/tests/data/test300
index 619063278eb6b6bd4ea86a757354ed1a1443d165..7daf261e9f02622e7d9259356df389fe2dfb4bde 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -18,7 +18,7 @@ MooMoo
 simple HTTPS GET
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/300
+-k https://%HOSTIP:%HTTPSPORT/300
 </command>
 </test>
 

diff --git a/tests/data/test301 b/tests/data/test301
index fc9edbe3eb6b9252d2d3065953462c3864726c8d..88ee14b3b7fd078475514008c2a49679e785ef08 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -18,7 +18,7 @@ Funny-head: yesyes
 HTTPS GET with user and password
  </name>
  <command>
- -u fake:user https://%HOSTIP:%HTTPSPORT/2
+-k -u fake:user https://%HOSTIP:%HTTPSPORT/2
 </command>
 </test>
 

diff --git a/tests/data/test302 b/tests/data/test302
index 9009603d9f3289d2b9e4dc4d7290ed28b665633f..1c0d34cc257beb04b3cbee37643b4b6eb06e295a 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -10,7 +10,7 @@
 HTTPS GET over HTTP proxy fails
  </name>
  <command>
- -U fake:user -x %HOSTIP:%HOSTPORT https://ssl.fakeurl-to.test/slash/302
+-k -U fake:user -x %HOSTIP:%HOSTPORT https://ssl.fakeurl-to.test/slash/302
 </command>
 </test>
 

diff --git a/tests/data/test304 b/tests/data/test304
index da58a8209935c43323deb566b4070d5c9d0a94b0..fe1559d5ad1fef813976066534a632797a36594c 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -16,7 +16,7 @@ blablabla
 HTTPS multipart formpost
  </name>
  <command>
-https://%HOSTIP:%HTTPSPORT/we/want/304 -F name=daniel -F tool=curl -F file=@log/test304.txt
+-k https://%HOSTIP:%HTTPSPORT/we/want/304 -F name=daniel -F tool=curl -F file=@log/test304.txt
 </command>
 # We create this file before the command is invoked!
 <file name="log/test304.txt">

diff --git a/tests/data/test400 b/tests/data/test400
index 2c118b83dc53accefab14bfb7993885cbbc4d82e..c8b361992e14a8ae1db8f4e9658917604c52f209 100644 (file)
--- a/tests/data/test400
+++ b/tests/data/test400
@@ -23,7 +23,7 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 FTPS dir list PASV
  </name>
  <command>
-ftps://%HOSTIP:%FTPSPORT/
+-k ftps://%HOSTIP:%FTPSPORT/
 </command>
 <file name="log/ftpserver.cmd">
 REPLY EPSV 500 no such command

diff --git a/tests/data/test401 b/tests/data/test401
index 8719ca8ca883feb39c5702b10102bd299faea2b6..c23420ddf3c77cd7e08e24eef8a75c455eb6a783 100644 (file)
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -9,7 +9,7 @@ moooooooo
 FTPS download with strict timeout and slow CWD
  </name>
  <command>
-ftps://%HOSTIP:%FTPSPORT/path/to/file/401 -m 4
+-k ftps://%HOSTIP:%FTPSPORT/path/to/file/401 -m 4
 </command>
 <file name="log/ftpserver.cmd">
 DELAY CWD 15

diff --git a/tests/data/test402 b/tests/data/test402
index 27b265c34cd3a2aeca786cf0bc4caf35582fce05..8699df0573bc5a3cadf9308eb0812f73c7b9a58a 100644 (file)
--- a/tests/data/test402
+++ b/tests/data/test402
@@ -9,7 +9,7 @@ moooooooo
 FTPS operation to FTP port
  </name>
  <command>
-ftps://%HOSTIP:%FTPPORT/path/to/file/402
+-k ftps://%HOSTIP:%FTPPORT/path/to/file/402
 </command>
 </test>