Fix Win32 test-suit.

diff --git a/ms/test.bat b/ms/test.bat
index c3a1b0c28d943605bc30834dcb1f03988b4f7bad..7fb044214734a8641b901a83fb29896c2cef5d37 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -87,20 +87,22 @@ echo testss
 call %test%\testss openssl\r
 if errorlevel 1 goto done\r
 \r
 call %test%\testss openssl\r
 if errorlevel 1 goto done\r
 \r

+set SSL_TEST=ssltest -key keyU.ss -cert certU.ss -c_key keyU.ss -c_cert certU.ss -CAfile certCA.ss\r
+\r

 echo test sslv2\r
 ssltest -ssl2\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with server authentication\r
 echo test sslv2\r
 ssltest -ssl2\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with server authentication\r

-ssltest -ssl2 -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl2 -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with client authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with client authentication\r

-ssltest -ssl2 -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl2 -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with both client and server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with both client and server authentication\r

-ssltest -ssl2 -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl2 -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3\r


@@ -108,15 +110,15 @@ ssltest -ssl3
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with server authentication\r

-ssltest -ssl3 -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl3 -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with client authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with client authentication\r

-ssltest -ssl3 -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl3 -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with both client and server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with both client and server authentication\r

-ssltest -ssl3 -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -ssl3 -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3\r


@@ -124,15 +126,15 @@ ssltest
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with server authentication\r

-ssltest -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with client authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with client authentication\r

-ssltest -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with both client and server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with both client and server authentication\r

-ssltest -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2 via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 via BIO pair\r


@@ -144,15 +146,15 @@ ssltest -bio_pair -dhe1024dsa -v
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with server authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with server authentication via BIO pair\r

-ssltest -bio_pair -ssl2 -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl2 -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with client authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with client authentication via BIO pair\r

-ssltest -bio_pair -ssl2 -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl2 -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with both client and server authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2 with both client and server authentication via BIO pair\r

-ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3 via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 via BIO pair\r


@@ -160,31 +162,31 @@ ssltest -bio_pair -ssl3
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with server authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with server authentication via BIO pair\r

-ssltest -bio_pair -ssl3 -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl3 -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with client authentication  via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with client authentication  via BIO pair\r

-ssltest -bio_pair -ssl3 -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl3 -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with both client and server authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv3 with both client and server authentication via BIO pair\r

-ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 via BIO pair\r

-ssltest\r
+ssltest -bio_pair\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with server authentication\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with server authentication\r

-ssltest -bio_pair -server_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -server_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with client authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with client authentication via BIO pair\r

-ssltest -bio_pair -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -client_auth\r

 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with both client and server authentication via BIO pair\r
 if errorlevel 1 goto done\r
 \r
 echo test sslv2/sslv3 with both client and server authentication via BIO pair\r

-ssltest -bio_pair -server_auth -client_auth -CAfile cert.tmp\r
+%SSL_TEST% -bio_pair -server_auth -client_auth\r

 if errorlevel 1 goto done\r
 \r
 del cert.tmp\r
 if errorlevel 1 goto done\r
 \r
 del cert.tmp\r