X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ms%2Ftest.bat;h=8f6919428324fb5ee213b9f9b4834e5bbf13f13f;hp=277602c56f15cb53f9b17b481c080b944a7691e1;hb=0bee0e6294882b18ffa0053597532058a19d6f89;hpb=31b8d8684441e6cd5138832bb1b2ddb10acd6ba6

diff --git a/ms/test.bat b/ms/test.bat
index 277602c56f..8f69194283 100755
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,11 +1,16 @@
-@echo=off
+@echo off
 
-set test=p:\work\ssleay\ms
+set test=..\ms
 set opath=%PATH%
-PATH=%1;%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
@@ -63,19 +68,19 @@ dsatest
 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
+openssl verify -CAfile cert.tmp ..\certs\*.pem
 
 echo testss
-call %test%\testss ssleay
+call %test%\testss openssl
 if errorlevel 1 goto done
 
 echo test sslv2
@@ -86,7 +91,7 @@ echo test sslv2 with server authentication
 ssltest -ssl2 -server_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
-echo test sslv2 with client authentication 
+echo test sslv2 with client authentication
 ssltest -ssl2 -client_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
@@ -102,7 +107,7 @@ echo test sslv3 with server authentication
 ssltest -ssl3 -server_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
-echo test sslv3 with client authentication 
+echo test sslv3 with client authentication
 ssltest -ssl3 -client_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
@@ -118,7 +123,7 @@ echo test sslv2/sslv3 with server authentication
 ssltest -server_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
-echo test sslv2/sslv3 with client authentication 
+echo test sslv2/sslv3 with client authentication
 ssltest -client_auth -CAfile cert.tmp
 if errorlevel 1 goto done
 
@@ -126,6 +131,57 @@ echo test sslv2/sslv3 with both client and server authentication
 ssltest -server_auth -client_auth -CAfile cert.tmp
 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
+if errorlevel 1 goto done
+
+echo test sslv2 with client authentication via BIO pair
+ssltest -bio_pair -ssl2 -client_auth -CAfile cert.tmp
+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
+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
+ssltest -bio_pair -ssl3 -server_auth -CAfile cert.tmp
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication  via BIO pair
+ssltest -bio_pair -ssl3 -client_auth -CAfile cert.tmp
+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
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 via BIO pair
+ssltest
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with server authentication
+ssltest -bio_pair -server_auth -CAfile cert.tmp
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with client authentication via BIO pair
+ssltest -bio_pair -client_auth -CAfile cert.tmp
+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
+if errorlevel 1 goto done
 
 del cert.tmp