X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ms%2Ftest.bat;h=e8b7ae226c219b4451786d87b1930041a64ab487;hb=a4d5269e6d0dba0c276c968448a3576f7604666a;hp=e1862c519a71aff95eb8085485d167f2114ac6d1;hpb=d02b48c63a58ea4367a0e905979f140b7d090f86;p=openssl.git

diff --git a/ms/test.bat b/ms/test.bat
index e1862c519a..e8b7ae226c 100755
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,133 +1,149 @@
-@echo=off
+@echo off
 
-set bin=..\out
-set test=.
+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
-%bin%\destest
+destest
 if errorlevel 1 goto done
 
 echo ideatest
-%bin%\ideatest
+ideatest
 if errorlevel 1 goto done
 
 echo bftest
-%bin%\bftest
-if errorlevel 1 goto done
-
-echo shatest
-%bin%\shatest
+bftest
 if errorlevel 1 goto done
 
 echo sha1test
-%bin%\sha1test
+sha1test
 if errorlevel 1 goto done
 
 echo md5test
-%bin%\md5test
-if errorlevel 1 goto done
-
-echo md2test
-%bin%\md2test
-if errorlevel 1 goto done
-
-echo mdc2test
-%bin%\mdc2test
+md5test
 if errorlevel 1 goto done
 
 echo rc2test
-%bin%\rc2test
+rc2test
 if errorlevel 1 goto done
 
 echo rc4test
-%bin%\rc4test
+rc4test
 if errorlevel 1 goto done
 
 echo randtest
-%bin%\randtest
+randtest
 if errorlevel 1 goto done
 
 echo dhtest
-%bin%\dhtest
+dhtest
 if errorlevel 1 goto done
 
 echo exptest
-%bin%\exptest
+exptest
 if errorlevel 1 goto done
 
 echo dsatest
-%bin%\dsatest
+dsatest
+if errorlevel 1 goto done
+
+echo ectest
+ectest
 if errorlevel 1 goto done
 
 echo testenc
-call %test%\testenc %bin%\ssleay
+call %test%\testenc openssl
 if errorlevel 1 goto done
 
 echo testpem
-call %test%\testpem %bin%\ssleay
+call %test%\testpem openssl
 if errorlevel 1 goto done
 
-echo verify
-copy ..\certs\*.pem cert.tmp >nul
-%bin%\ssleay verify -CAfile cert.tmp ..\certs\*.pem
-
 echo testss
-call %test%\testss %bin%\ssleay
+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 sslv3
+ssltest -ssl3
 if errorlevel 1 goto done
 
-echo test sslv2
-%bin%\ssltest -ssl2
+echo test sslv3 with server authentication
+%SSL_TEST% -ssl3 -server_auth
 if errorlevel 1 goto done
 
-echo test sslv2 with server authentication
-%bin%\ssltest -ssl2 -server_auth -CAfile cert.tmp
+echo test sslv3 with client authentication
+%SSL_TEST% -ssl3 -client_auth
 if errorlevel 1 goto done
 
-echo test sslv2 with client authentication 
-%bin%\ssltest -ssl2 -client_auth -CAfile cert.tmp
+echo test sslv3 with both client and server authentication
+%SSL_TEST% -ssl3 -server_auth -client_auth
 if errorlevel 1 goto done
 
-echo test sslv2 with beoth client and server authentication
-%bin%\ssltest -ssl2 -server_auth -client_auth -CAfile cert.tmp
+echo test sslv2/sslv3
+ssltest
 if errorlevel 1 goto done
 
-echo test sslv3
-%bin%\ssltest -ssl3
+echo test sslv2/sslv3 with server authentication
+%SSL_TEST% -server_auth
 if errorlevel 1 goto done
 
-echo test sslv3 with server authentication
-%bin%\ssltest -ssl3 -server_auth -CAfile cert.tmp
+echo test sslv2/sslv3 with client authentication
+%SSL_TEST% -client_auth
 if errorlevel 1 goto done
 
-echo test sslv3 with client authentication 
-%bin%\ssltest -ssl3 -client_auth -CAfile cert.tmp
+echo test sslv2/sslv3 with both client and server authentication
+%SSL_TEST% -server_auth -client_auth
 if errorlevel 1 goto done
 
-echo test sslv3 with beoth client and server authentication
-%bin%\ssltest -ssl3 -server_auth -client_auth -CAfile cert.tmp
+echo test sslv2/sslv3 with 1024 bit DHE via BIO pair
+ssltest -bio_pair -dhe1024dsa -v
 if errorlevel 1 goto done
 
-echo test sslv2/sslv3
-%bin%\ssltest
+echo test sslv3 via BIO pair
+ssltest -bio_pair -ssl3
 if errorlevel 1 goto done
 
-echo test sslv2/sslv3 with server authentication
-%bin%\ssltest -server_auth -CAfile cert.tmp
+echo test sslv3 with server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -server_auth
 if errorlevel 1 goto done
 
-echo test sslv2/sslv3 with client authentication 
-%bin%\ssltest -client_auth -CAfile cert.tmp
+echo test sslv3 with client authentication  via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -client_auth
 if errorlevel 1 goto done
 
-echo test sslv2/sslv3 with beoth client and server authentication
-%bin%\ssltest -server_auth -client_auth -CAfile cert.tmp
+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
 
+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
 
-del cert.tmp
+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%