test320/1/2/4: fix the port number substitution variables

These tests have been broken since commit 1958fe57 in Oct. 2011

diff --git a/tests/data/test320 b/tests/data/test320
index cb0e234030d61526508a7ab22967f60c3615968d..89b4e141ce309726a3b4b1342626ba734385a904 100644 (file)
--- a/tests/data/test320
+++ b/tests/data/test320
@@ -50,7 +50,7 @@ TLS-SRP
 simple TLS-SRP HTTPS GET, check user in response
  </name>
 <command>
---insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSSRPPORT
+--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT
 </command>
 </client>
 
@@ -78,7 +78,7 @@ Content-type: text/html
 <TR><TD>MAC</TD><TD>SHA1</TD></TR>
 <TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_128_CBC_SHA1</TD></TR></p></TABLE>
 <PRE>
-Host: %HOSTIP:%HTTPTLSSRPPORT\r
+Host: %HOSTIP:%HTTPTLSPORT\r
 Accept: */*\r
 \r
 </PRE></P>

diff --git a/tests/data/test321 b/tests/data/test321
index ccdfb86d08610853c626f3c7da6c6394cd0b66b6..c6b208b2a21cbd52e4b98f04d3de697a5889e8d3 100644 (file)
--- a/tests/data/test321
+++ b/tests/data/test321
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP with bad username and password
  </name>
 <command>
---insecure --tlsauthtype SRP --tlsuser baduser --tlspassword badpass https://%HOSTIP:%HTTPTLSSRPPORT
+--insecure --tlsauthtype SRP --tlsuser baduser --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
 </command>
 </client>
 

diff --git a/tests/data/test322 b/tests/data/test322
index f35345eadb636742b339ed3f3b51038d712be935..f7f82790fdaed464030d22c2b9feb0e3e0723d65 100644 (file)
--- a/tests/data/test322
+++ b/tests/data/test322
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP with bad password
  </name>
 <command>
---insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPTLSSRPPORT
+--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
 </command>
 </client>
 

diff --git a/tests/data/test324 b/tests/data/test324
index bc1c48fead12c01a3536a4abb9d1a66c0d9ae771..b58d940e56a3773ffbf9269aa1552368fa5e88a3 100644 (file)
--- a/tests/data/test324
+++ b/tests/data/test324
@@ -19,7 +19,7 @@ TLS-SRP
 TLS-SRP with server cert checking
  </name>
 <command> # no --insecure
---tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSSRPPORT/want/323
+--tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/323
 </command>
 </client>