Don't return from main(), use EXIT() instead

[openssl.git] / ms / test.bat

diff --git a/ms/test.bat b/ms/test.bat
index cffaf4652456e9478f0b2295cea9181c8571858d..e8b7ae226c219b4451786d87b1930041a64ab487 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,9 +1,16 @@
-@echo=off
+@echo off
 
 set test=..\ms
+set opath=%PATH%
+PATH=..\ms;%PATH%
+set OPENSSL_CONF=..\apps\openssl.cnf
 
 rem run this from inside the bin directory
 
+echo rsa_test
+rsa_test
+if errorlevel 1 goto done
+
 echo destest
 destest
 if errorlevel 1 goto done
@@ -16,10 +23,6 @@ echo bftest
 bftest
 if errorlevel 1 goto done
 
-echo shatest
-shatest
-if errorlevel 1 goto done
-
 echo sha1test
 sha1test
 if errorlevel 1 goto done
@@ -28,14 +31,6 @@ echo md5test
 md5test
 if errorlevel 1 goto done
 
-echo md2test
-md2test
-if errorlevel 1 goto done
-
-echo mdc2test
-mdc2test
-if errorlevel 1 goto done
-
 echo rc2test
 rc2test
 if errorlevel 1 goto done
@@ -60,52 +55,38 @@ echo dsatest
 dsatest
 if errorlevel 1 goto done
 
+echo ectest
+ectest
+if errorlevel 1 goto done
+
 echo testenc
-call %test%\testenc ssleay
+call %test%\testenc openssl
 if errorlevel 1 goto done
 
 echo testpem
-call %test%\testpem ssleay
+call %test%\testpem openssl
 if errorlevel 1 goto done
 
-echo verify
-copy ..\certs\*.pem cert.tmp >nul
-ssleay verify -CAfile cert.tmp ..\certs\*.pem
-
 echo testss
-call %test%\testss ssleay
+call %test%\testss openssl
 if errorlevel 1 goto done
 
-echo test sslv2
-ssltest -ssl2
-if errorlevel 1 goto done
-
-echo test sslv2 with server authentication
-ssltest -ssl2 -server_auth -CAfile cert.tmp
-if errorlevel 1 goto done
-
-echo test sslv2 with client authentication 
-ssltest -ssl2 -client_auth -CAfile cert.tmp
-if errorlevel 1 goto done
-
-echo test sslv2 with both client and server authentication
-ssltest -ssl2 -server_auth -client_auth -CAfile cert.tmp
-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 sslv3
 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
+echo test sslv3 with client authentication
+%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
@@ -113,22 +94,56 @@ 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
+echo test sslv2/sslv3 with client authentication
+%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/sslv3 with 1024 bit DHE via BIO pair
+ssltest -bio_pair -dhe1024dsa -v
+if errorlevel 1 goto done
+
+echo test sslv3 via BIO pair
+ssltest -bio_pair -ssl3
+if errorlevel 1 goto done
+
+echo test sslv3 with server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication  via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth
+if errorlevel 1 goto done
 
-del cert.tmp
+echo test sslv2/sslv3 via BIO pair
+ssltest -bio_pair
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with server authentication
+%SSL_TEST% -bio_pair -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with client authentication via BIO pair
+%SSL_TEST% -bio_pair -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -server_auth -client_auth
+if errorlevel 1 goto done
 
 echo passed all tests
 goto end
 :done
 echo problems.....
 :end
+PATH=%opath%