Commit 09ef94d2 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Fix Win32 test-suit.

parent 3ffb8d42

ms/test.bat

+21 −19
Original line number Diff line number Diff line
@@ -87,20 +87,22 @@ echo testss 
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 sslv2

ssltest -ssl2

if errorlevel 1 goto done



echo test sslv2 with server authentication

ssltest -ssl2 -server_auth -CAfile cert.tmp

%SSL_TEST% -ssl2 -server_auth

if errorlevel 1 goto done



echo test sslv2 with client authentication

ssltest -ssl2 -client_auth -CAfile cert.tmp

%SSL_TEST% -ssl2 -client_auth

if errorlevel 1 goto done



echo test sslv2 with both client and server authentication

ssltest -ssl2 -server_auth -client_auth -CAfile cert.tmp

%SSL_TEST% -ssl2 -server_auth -client_auth

if errorlevel 1 goto done



echo test sslv3
@@ -108,15 +110,15 @@ 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

%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
@@ -124,15 +126,15 @@ 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

%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 via BIO pair
@@ -144,15 +146,15 @@ 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

%SSL_TEST% -bio_pair -ssl2 -server_auth

if errorlevel 1 goto done



echo test sslv2 with client authentication via BIO pair

ssltest -bio_pair -ssl2 -client_auth -CAfile cert.tmp

%SSL_TEST% -bio_pair -ssl2 -client_auth

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

%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth

if errorlevel 1 goto done



echo test sslv3 via BIO pair
@@ -160,31 +162,31 @@ 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

%SSL_TEST% -bio_pair -ssl3 -server_auth

if errorlevel 1 goto done



echo test sslv3 with client authentication  via BIO pair

ssltest -bio_pair -ssl3 -client_auth -CAfile cert.tmp

%SSL_TEST% -bio_pair -ssl3 -client_auth

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

%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth

if errorlevel 1 goto done



echo test sslv2/sslv3 via BIO pair

ssltest

ssltest -bio_pair

if errorlevel 1 goto done



echo test sslv2/sslv3 with server authentication

ssltest -bio_pair -server_auth -CAfile cert.tmp

%SSL_TEST% -bio_pair -server_auth

if errorlevel 1 goto done



echo test sslv2/sslv3 with client authentication via BIO pair

ssltest -bio_pair -client_auth -CAfile cert.tmp

%SSL_TEST% -bio_pair -client_auth

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

%SSL_TEST% -bio_pair -server_auth -client_auth

if errorlevel 1 goto done



del cert.tmp