X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ms%2Ftest.bat;h=5085670b99e0e3eb7330be6caa7dfa35bd630301;hp=9a54afe065fc17f8348969736227be5dd9979a02;hb=f8bc3e1bd842752edfe5d6fb9449a223167124e9;hpb=721b5b2a5c27365685adb59412b4a5d0b168221d

diff --git a/ms/test.bat b/ms/test.bat
index 9a54afe065..5085670b99 100755
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,4 +1,4 @@
-@echo=off
+@echo off
 
 set test=..\ms
 set opath=%PATH%
@@ -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
@@ -67,6 +63,10 @@ echo dsatest
 dsatest
 if errorlevel 1 goto done
 
+echo ectest
+ectest
+if errorlevel 1 goto done
+
 echo testenc
 call %test%\testenc openssl
 if errorlevel 1 goto done
@@ -83,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
@@ -104,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
@@ -120,31 +122,35 @@ 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
 ssltest -bio_pair -ssl2
 if errorlevel 1 goto done
 
+echo test sslv2/sslv3 with 1024 bit DHE via BIO pair
+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
@@ -152,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