X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ms%2Ftest.bat;h=5085670b99e0e3eb7330be6caa7dfa35bd630301;hp=c3a1b0c28d943605bc30834dcb1f03988b4f7bad;hb=3627fedbea173f2155a5cd72053d6f29af4e0dfc;hpb=c8252b71b5930216367bdd4b5b3a23fc75ee3845

diff --git a/ms/test.bat b/ms/test.bat
index c3a1b0c28d..5085670b99 100755
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -39,10 +39,6 @@ echo md2test
 md2test
 if errorlevel 1 goto done
 
-echo mdc2test
-mdc2test
-if errorlevel 1 goto done
-
 echo rc2test
 rc2test
 if errorlevel 1 goto done
@@ -87,20 +83,22 @@ echo testss
 call %test%\testss openssl
 if errorlevel 1 goto done
 
+set SSL_TEST=ssltest -key keyU.ss -cert certU.ss -c_key keyU.ss -c_cert certU.ss -CAfile certCA.ss
+
 echo test sslv2
 ssltest -ssl2
 if errorlevel 1 goto done
 
 echo test sslv2 with server authentication
-ssltest -ssl2 -server_auth -CAfile cert.tmp
+%SSL_TEST% -ssl2 -server_auth
 if errorlevel 1 goto done
 
 echo test sslv2 with client authentication
-ssltest -ssl2 -client_auth -CAfile cert.tmp
+%SSL_TEST% -ssl2 -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2 with both client and server authentication
-ssltest -ssl2 -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -ssl2 -server_auth -client_auth
 if errorlevel 1 goto done
 
 echo test sslv3
@@ -108,15 +106,15 @@ ssltest -ssl3
 if errorlevel 1 goto done
 
 echo test sslv3 with server authentication
-ssltest -ssl3 -server_auth -CAfile cert.tmp
+%SSL_TEST% -ssl3 -server_auth
 if errorlevel 1 goto done
 
 echo test sslv3 with client authentication
-ssltest -ssl3 -client_auth -CAfile cert.tmp
+%SSL_TEST% -ssl3 -client_auth
 if errorlevel 1 goto done
 
 echo test sslv3 with both client and server authentication
-ssltest -ssl3 -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -ssl3 -server_auth -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3
@@ -124,15 +122,15 @@ ssltest
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with server authentication
-ssltest -server_auth -CAfile cert.tmp
+%SSL_TEST% -server_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with client authentication
-ssltest -client_auth -CAfile cert.tmp
+%SSL_TEST% -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with both client and server authentication
-ssltest -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -server_auth -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2 via BIO pair
@@ -144,15 +142,15 @@ ssltest -bio_pair -dhe1024dsa -v
 if errorlevel 1 goto done
 
 echo test sslv2 with server authentication via BIO pair
-ssltest -bio_pair -ssl2 -server_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl2 -server_auth
 if errorlevel 1 goto done
 
 echo test sslv2 with client authentication via BIO pair
-ssltest -bio_pair -ssl2 -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl2 -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2 with both client and server authentication via BIO pair
-ssltest -bio_pair -ssl2 -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth
 if errorlevel 1 goto done
 
 echo test sslv3 via BIO pair
@@ -160,31 +158,31 @@ ssltest -bio_pair -ssl3
 if errorlevel 1 goto done
 
 echo test sslv3 with server authentication via BIO pair
-ssltest -bio_pair -ssl3 -server_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl3 -server_auth
 if errorlevel 1 goto done
 
 echo test sslv3 with client authentication  via BIO pair
-ssltest -bio_pair -ssl3 -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl3 -client_auth
 if errorlevel 1 goto done
 
 echo test sslv3 with both client and server authentication via BIO pair
-ssltest -bio_pair -ssl3 -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 via BIO pair
-ssltest
+ssltest -bio_pair
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with server authentication
-ssltest -bio_pair -server_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -server_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with client authentication via BIO pair
-ssltest -bio_pair -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -client_auth
 if errorlevel 1 goto done
 
 echo test sslv2/sslv3 with both client and server authentication via BIO pair
-ssltest -bio_pair -server_auth -client_auth -CAfile cert.tmp
+%SSL_TEST% -bio_pair -server_auth -client_auth
 if errorlevel 1 goto done
 
 del cert.tmp