Fix the S/MIME code so it now works again and

[openssl.git] / ms / test.bat

diff --git a/ms/test.bat b/ms/test.bat
index aa2f5df6d4f253fc2372e557cd6cf52e9823aaec..8f6919428324fb5ee213b9f9b4834e5bbf13f13f 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,4 +1,4 @@
-@echo=off\r
+@echo off\r
 \r
 set test=..\ms\r
 set opath=%PATH%\r
@@ -7,6 +7,10 @@ set OPENSSL_CONF=..\apps\openssl.cnf
 \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
@@ -87,7 +91,7 @@ echo test sslv2 with server authentication
 ssltest -ssl2 -server_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
-echo test sslv2 with client authentication \r
+echo test sslv2 with client authentication\r
 ssltest -ssl2 -client_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
@@ -103,7 +107,7 @@ echo test sslv3 with server authentication
 ssltest -ssl3 -server_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
-echo test sslv3 with client authentication \r
+echo test sslv3 with client authentication\r
 ssltest -ssl3 -client_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
@@ -119,7 +123,7 @@ echo test sslv2/sslv3 with server authentication
 ssltest -server_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
-echo test sslv2/sslv3 with client authentication \r
+echo test sslv2/sslv3 with client authentication\r
 ssltest -client_auth -CAfile cert.tmp\r
 if errorlevel 1 goto done\r
 \r
@@ -127,6 +131,57 @@ echo test sslv2/sslv3 with both client and server authentication
 ssltest -server_auth -client_auth -CAfile cert.tmp\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
+ssltest -bio_pair -ssl2 -server_auth -CAfile cert.tmp\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
+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
+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
+ssltest -bio_pair -ssl3 -server_auth -CAfile cert.tmp\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
+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
+if errorlevel 1 goto done\r
+\r
+echo test sslv2/sslv3 via BIO pair\r
+ssltest\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
+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
+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
+if errorlevel 1 goto done\r
 \r
 del cert.tmp\r
 \r