diff options
author | Andy Polyakov <appro@openssl.org> | 2004-12-30 22:55:28 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2004-12-30 22:55:28 +0000 |
commit | 09ef94d2c9c860e0ca75bcef636df4924c8f850a (patch) | |
tree | 9f3e3181364911a075f59bab96a62ce3792a0f15 | |
parent | 3ffb8d42bce2056de9e41dd03176332337b02eaa (diff) | |
download | openssl-09ef94d2c9c860e0ca75bcef636df4924c8f850a.tar.gz |
Fix Win32 test-suit.
-rwxr-xr-x | ms/test.bat | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/ms/test.bat b/ms/test.bat index c3a1b0c28d..7fb0442147 100755 --- a/ms/test.bat +++ b/ms/test.bat @@ -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
|