From 4dc3a57718d8fbefde9e7d4be4db9db105291d16 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 11 Jul 2014 23:40:01 +0200
Subject: [PATCH] test320/1/2/4: fix the port number substitution variables

These tests have been broken since commit 1958fe57 in Oct. 2011
---
 tests/data/test320 | 4 ++--
 tests/data/test321 | 2 +-
 tests/data/test322 | 2 +-
 tests/data/test324 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/data/test320 b/tests/data/test320
index cb0e23403..89b4e141c 100644
--- 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
+Host: %HOSTIP:%HTTPTLSPORT
 Accept: */*
 
 </PRE></P>
diff --git a/tests/data/test321 b/tests/data/test321
index ccdfb86d0..c6b208b2a 100644
--- 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 f35345ead..f7f82790f 100644
--- 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 bc1c48fea..b58d940e5 100644
--- 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>