Complete synchronization of aes-x86_64 with aes-586.

[openssl.git] / ms / test.bat

diff --git a/ms/test.bat b/ms/test.bat
index 277602c56f15cb53f9b17b481c080b944a7691e1..5085670b99e0e3eb7330be6caa7dfa35bd630301 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,11 +1,16 @@
-@echo=off\r
+@echo off\r
 \r
-set test=p:\work\ssleay\ms\r
+set test=..\ms\r
 set opath=%PATH%\r
-PATH=%1;%PATH%\r
+PATH=..\ms;%PATH%\r
+set OPENSSL_CONF=..\apps\openssl.cnf\r
 \r
 rem run this from inside the bin directory\r
 \r
+echo rsa_test\r
+rsa_test\r
+if errorlevel 1 goto done\r
+\r
 echo destest\r
 destest\r
 if errorlevel 1 goto done\r
@@ -34,10 +39,6 @@ echo md2test
 md2test\r
 if errorlevel 1 goto done\r
 \r
-echo mdc2test\r
-mdc2test\r
-if errorlevel 1 goto done\r
-\r
 echo rc2test\r
 rc2test\r
 if errorlevel 1 goto done\r
@@ -62,36 +63,42 @@ echo dsatest
 dsatest\r
 if errorlevel 1 goto done\r
 \r
+echo ectest\r
+ectest\r
+if errorlevel 1 goto done\r
+\r
 echo testenc\r
-call %test%\testenc ssleay\r
+call %test%\testenc openssl\r
 if errorlevel 1 goto done\r
 \r
 echo testpem\r
-call %test%\testpem ssleay\r
+call %test%\testpem openssl\r
 if errorlevel 1 goto done\r
 \r
 echo verify\r
 copy ..\certs\*.pem cert.tmp >nul\r
-ssleay verify -CAfile cert.tmp ..\certs\*.pem\r
+openssl verify -CAfile cert.tmp ..\certs\*.pem\r
 \r
 echo testss\r
-call %test%\testss ssleay\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
-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
-ssltest -ssl2 -client_auth -CAfile cert.tmp\r
+echo test sslv2 with client authentication\r
+%SSL_TEST% -ssl2 -client_auth\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
@@ -99,15 +106,15 @@ ssltest -ssl3
 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
-ssltest -ssl3 -client_auth -CAfile cert.tmp\r
+echo test sslv3 with client authentication\r
+%SSL_TEST% -ssl3 -client_auth\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
@@ -115,17 +122,68 @@ ssltest
 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
-ssltest -client_auth -CAfile cert.tmp\r
+echo test sslv2/sslv3 with client authentication\r
+%SSL_TEST% -client_auth\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
+ssltest -bio_pair -ssl2\r
+if errorlevel 1 goto done\r
+\r
+echo test sslv2/sslv3 with 1024 bit DHE via BIO pair\r
+ssltest -bio_pair -dhe1024dsa -v\r
+if errorlevel 1 goto done\r
+\r
+echo test sslv2 with server authentication via BIO pair\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
+%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
+%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth\r
 if errorlevel 1 goto done\r
 \r
+echo test sslv3 via BIO pair\r
+ssltest -bio_pair -ssl3\r
+if errorlevel 1 goto done\r
+\r
+echo test sslv3 with server authentication via BIO pair\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
+%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
+%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
+ssltest -bio_pair\r
+if errorlevel 1 goto done\r
+\r
+echo test sslv2/sslv3 with server authentication\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
+%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
+%SSL_TEST% -bio_pair -server_auth -client_auth\r
+if errorlevel 1 goto done\r
 \r
 del cert.tmp\r
 \r