From f9e7ce5ed235929a96761afdf8ffc88c46de3a80 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Sun, 5 Jul 2020 13:30:54 +0900 Subject: Test both SSLv3 and TLSv1.2, select cipher suite that the protocol can handle Follow upstream r1.12 and r1.13 - Test both SSLv3 and TLSv1.2 cipher suites with TLS. - Handle the fact that TLSv1.3 cipher suites are now being included in the output from `openssl ciphers` --- tests/testssl.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/testssl.bat b/tests/testssl.bat index dbc162a..1a55f76 100644 --- a/tests/testssl.bat +++ b/tests/testssl.bat @@ -56,9 +56,9 @@ echo test sslv2/sslv3 with both client and server authentication via BIO pair an %ssltest% -bio_pair -server_auth -client_auth -app_verify %CA% %extra% & if !errorlevel! neq 0 exit /b 1 echo "Testing ciphersuites" -for %%p in ( TLSv1.2 ) do ( +for %%p in ( SSLv3,TLSv1.2 ) do ( echo "Testing ciphersuites for %%p" - for /f "usebackq" %%c in (`%openssl% ciphers -v "%%p+aRSA"`) do ( + for /f "usebackq" %%c in (`%openssl% ciphers -v "%%p+aRSA" ^| find "%%p"`) do ( echo "Testing %%c" %ssltest% -cipher %%c if !errorlevel! neq 0 ( @@ -113,7 +113,7 @@ echo test dtlsv1 with both client and server authentication echo "Testing DTLS ciphersuites" for %%p in ( SSLv3 ) do ( echo "Testing ciphersuites for %%p" - for /f "usebackq" %%c in (`%openssl% ciphers -v "RSA+%%p:-RC4"`) do ( + for /f "usebackq" %%c in (`%openssl% ciphers -v "RSA+%%p:-RC4" ^| find "%%p"`) do ( echo "Testing %%c" %ssltest% -cipher %%c -dtls1 if !errorlevel! neq 0 ( -- cgit v1.2.3-55-g6feb