update testssl.bat for TLS 1.0 removal

1 files changed, 19 insertions, 20 deletions

diff --git a/tests/testssl.bat b/tests/testssl.bat
index 4c3ca1b..c4e6286 100644
--- a/tests/testssl.bat
+++ b/tests/testssl.bat
@@ -1,4 +1,4 @@
-@echo off

+@echo on

 setlocal enabledelayedexpansion

 REM     testssl.bat

 

@@ -88,8 +88,7 @@ for /f "usebackq" %%s in (`%openssl% no-dh`) do set nodh=%%s
 if %nodh%==no-dh (

   echo skipping anonymous DH tests

 ) else (

-  echo test tls1 with 1024bit anonymous DH, multiple handshakes

-  %ssltest% -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time %extra% & if !errorlevel! neq 0 exit /b 1

+  echo skipping tls1 tests.

 )

 

 REM #for /f "usebackq" %%s in (`%openssl% no-rsa`) do set norsa=%%s

@@ -112,24 +111,24 @@ REM #
 REM # DTLS tests

 REM #

 

-echo test dtlsv1

-%ssltest% -dtls1 %extra% & if !errorlevel! neq 0 exit /b 1

+echo test dtlsv1_2

+%ssltest% -dtls1_2 %extra% & if !errorlevel! neq 0 exit /b 1

 

-echo test dtlsv1 with server authentication

-%ssltest% -dtls1 -server_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

+echo test dtlsv1_2 with server authentication

+%ssltest% -dtls1_2 -server_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

 

-echo test dtlsv1 with client authentication

-%ssltest% -dtls1 -client_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

+echo test dtlsv1_2 with client authentication

+%ssltest% -dtls1_2 -client_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

 

-echo test dtlsv1 with both client and server authentication

-%ssltest% -dtls1 -server_auth -client_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

+echo test dtlsv1_2 with both client and server authentication

+%ssltest% -dtls1_2 -server_auth -client_auth %CA% %extra% & if !errorlevel! neq 0 exit /b 1

 

 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" ^| find "%%p"`) do (

     echo "Testing %%c"

-    %ssltest% -cipher %%c -dtls1

+    %ssltest% -cipher %%c -dtls1_2

     if !errorlevel! neq 0 (

       echo "Failed %%c"

       exit /b 1

@@ -141,19 +140,19 @@ REM #
 REM # ALPN tests

 REM #

 echo "Testing ALPN..."

-%ssltest% -bio_pair -tls1 -alpn_client foo -alpn_server bar & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client foo -alpn_server foo ^

+%ssltest% -bio_pair -alpn_client foo -alpn_server bar & if !errorlevel! neq 0 exit /b 1

+%ssltest% -bio_pair -alpn_client foo -alpn_server foo ^

   -alpn_expected foo & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client foo,bar -alpn_server foo ^

+%ssltest% -bio_pair -alpn_client foo,bar -alpn_server foo ^

   -alpn_expected foo & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client bar,foo -alpn_server foo ^

+%ssltest% -bio_pair -alpn_client bar,foo -alpn_server foo ^

   -alpn_expected foo & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client bar,foo -alpn_server foo,bar ^

+%ssltest% -bio_pair -alpn_client bar,foo -alpn_server foo,bar ^

   -alpn_expected foo & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client bar,foo -alpn_server bar,foo ^

+%ssltest% -bio_pair -alpn_client bar,foo -alpn_server bar,foo ^

   -alpn_expected bar & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client foo,bar -alpn_server bar,foo ^

+%ssltest% -bio_pair -alpn_client foo,bar -alpn_server bar,foo ^

   -alpn_expected bar & if !errorlevel! neq 0 exit /b 1

-%ssltest% -bio_pair -tls1 -alpn_client baz -alpn_server bar,foo & if !errorlevel! neq 0 exit /b 1

+%ssltest% -bio_pair -alpn_client baz -alpn_server bar,foo & if !errorlevel! neq 0 exit /b 1

 

 endlocal