Remove tests which rely on old root certs being present.

diff --git a/ms/test.bat b/ms/test.bat
index 5085670b99e0e3eb7330be6caa7dfa35bd630301..f729261782ce1920dfd989454c5d6e587416ab30 100755 (executable)
--- a/ms/test.bat
+++ b/ms/test.bat
@@ -1,195 +1,190 @@
-@echo off\r
-\r
-set test=..\ms\r
-set opath=%PATH%\r
-PATH=..\ms;%PATH%\r
-set OPENSSL_CONF=..\apps\openssl.cnf\r
-\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
-\r
-echo ideatest\r
-ideatest\r
-if errorlevel 1 goto done\r
-\r
-echo bftest\r
-bftest\r
-if errorlevel 1 goto done\r
-\r
-echo shatest\r
-shatest\r
-if errorlevel 1 goto done\r
-\r
-echo sha1test\r
-sha1test\r
-if errorlevel 1 goto done\r
-\r
-echo md5test\r
-md5test\r
-if errorlevel 1 goto done\r
-\r
-echo md2test\r
-md2test\r
-if errorlevel 1 goto done\r
-\r
-echo rc2test\r
-rc2test\r
-if errorlevel 1 goto done\r
-\r
-echo rc4test\r
-rc4test\r
-if errorlevel 1 goto done\r
-\r
-echo randtest\r
-randtest\r
-if errorlevel 1 goto done\r
-\r
-echo dhtest\r
-dhtest\r
-if errorlevel 1 goto done\r
-\r
-echo exptest\r
-exptest\r
-if errorlevel 1 goto done\r
-\r
-echo dsatest\r
-dsatest\r
-if errorlevel 1 goto done\r
-\r
-echo ectest\r
-ectest\r
-if errorlevel 1 goto done\r
-\r
-echo testenc\r
-call %test%\testenc openssl\r
-if errorlevel 1 goto done\r
-\r
-echo testpem\r
-call %test%\testpem openssl\r
-if errorlevel 1 goto done\r
-\r
-echo verify\r
-copy ..\certs\*.pem cert.tmp >nul\r
-openssl verify -CAfile cert.tmp ..\certs\*.pem\r
-\r
-echo testss\r
-call %test%\testss openssl\r
-if errorlevel 1 goto done\r
-\r
-set SSL_TEST=ssltest -key keyU.ss -cert certU.ss -c_key keyU.ss -c_cert certU.ss -CAfile certCA.ss\r
-\r
-echo test sslv2\r
-ssltest -ssl2\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2 with server authentication\r
-%SSL_TEST% -ssl2 -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2 with client authentication\r
-%SSL_TEST% -ssl2 -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2 with both client and server authentication\r
-%SSL_TEST% -ssl2 -server_auth -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3\r
-ssltest -ssl3\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3 with server authentication\r
-%SSL_TEST% -ssl3 -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3 with client authentication\r
-%SSL_TEST% -ssl3 -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3 with both client and server authentication\r
-%SSL_TEST% -ssl3 -server_auth -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3\r
-ssltest\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with server authentication\r
-%SSL_TEST% -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with client authentication\r
-%SSL_TEST% -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with both client and server authentication\r
-%SSL_TEST% -server_auth -client_auth\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
-%SSL_TEST% -bio_pair -ssl2 -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2 with client authentication via BIO pair\r
-%SSL_TEST% -bio_pair -ssl2 -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2 with both client and server authentication via BIO pair\r
-%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth\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
-%SSL_TEST% -bio_pair -ssl3 -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3 with client authentication  via BIO pair\r
-%SSL_TEST% -bio_pair -ssl3 -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv3 with both client and server authentication via BIO pair\r
-%SSL_TEST% -bio_pair -ssl3 -server_auth -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 via BIO pair\r
-ssltest -bio_pair\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with server authentication\r
-%SSL_TEST% -bio_pair -server_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with client authentication via BIO pair\r
-%SSL_TEST% -bio_pair -client_auth\r
-if errorlevel 1 goto done\r
-\r
-echo test sslv2/sslv3 with both client and server authentication via BIO pair\r
-%SSL_TEST% -bio_pair -server_auth -client_auth\r
-if errorlevel 1 goto done\r
-\r
-del cert.tmp\r
-\r
-echo passed all tests\r
-goto end\r
-:done\r
-echo problems.....\r
-:end\r
-PATH=%opath%\r
+@echo off
+
+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
+destest
+if errorlevel 1 goto done
+
+echo ideatest
+ideatest
+if errorlevel 1 goto done
+
+echo bftest
+bftest
+if errorlevel 1 goto done
+
+echo shatest
+shatest
+if errorlevel 1 goto done
+
+echo sha1test
+sha1test
+if errorlevel 1 goto done
+
+echo md5test
+md5test
+if errorlevel 1 goto done
+
+echo md2test
+md2test
+if errorlevel 1 goto done
+
+echo rc2test
+rc2test
+if errorlevel 1 goto done
+
+echo rc4test
+rc4test
+if errorlevel 1 goto done
+
+echo randtest
+randtest
+if errorlevel 1 goto done
+
+echo dhtest
+dhtest
+if errorlevel 1 goto done
+
+echo exptest
+exptest
+if errorlevel 1 goto done
+
+echo dsatest
+dsatest
+if errorlevel 1 goto done
+
+echo ectest
+ectest
+if errorlevel 1 goto done
+
+echo testenc
+call %test%\testenc openssl
+if errorlevel 1 goto done
+
+echo testpem
+call %test%\testpem openssl
+if errorlevel 1 goto done
+
+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
+%SSL_TEST% -ssl2 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with client authentication
+%SSL_TEST% -ssl2 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with both client and server authentication
+%SSL_TEST% -ssl2 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3
+ssltest -ssl3
+if errorlevel 1 goto done
+
+echo test sslv3 with server authentication
+%SSL_TEST% -ssl3 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication
+%SSL_TEST% -ssl3 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with both client and server authentication
+%SSL_TEST% -ssl3 -server_auth -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3
+ssltest
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with server authentication
+%SSL_TEST% -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with client authentication
+%SSL_TEST% -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2/sslv3 with both client and server authentication
+%SSL_TEST% -server_auth -client_auth
+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
+%SSL_TEST% -bio_pair -ssl2 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with client authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl2 -client_auth
+if errorlevel 1 goto done
+
+echo test sslv2 with both client and server authentication via BIO pair
+%SSL_TEST% -bio_pair -ssl2 -server_auth -client_auth
+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
+%SSL_TEST% -bio_pair -ssl3 -server_auth
+if errorlevel 1 goto done
+
+echo test sslv3 with client authentication  via BIO pair
+%SSL_TEST% -bio_pair -ssl3 -client_auth
+if errorlevel 1 goto done
+
+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
+
+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%