From b623832176e3a9f7307fdbdc2d27a6fa4b4f5404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 14 Apr 2022 09:12:10 +0200 Subject: [PATCH 1/2] Fix compat.sh invocation in basic-built-test.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- tests/scripts/basic-build-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index 8756634ab..56fd5b981 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh @@ -121,7 +121,7 @@ echo echo '################ compat.sh ################' { echo '#### compat.sh: Default versions' - sh compat.sh -m 'tls1 tls1_1 tls1_2 dtls1 dtls1_2' + sh compat.sh -m 'tls1 tls1_1 tls12 dtls1 dtls12' echo echo '#### compat.sh: legacy (SSLv3)' From 6abc6259d5af94c87abb1c017ad0621a17b6afad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Thu, 14 Apr 2022 09:21:56 +0200 Subject: [PATCH 2/2] Add comment in compat.sh about callers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also update comments about default versions and excludes while at it. Signed-off-by: Manuel Pégourié-Gonnard --- tests/compat.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/compat.sh b/tests/compat.sh index a03407c6f..560af59d6 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -67,17 +67,19 @@ else fi # default values for options -MODES="tls1 tls1_1 tls12 dtls1 dtls12" +# /!\ keep this synchronised with: +# - basic-build-test.sh +# - all.sh (multiple components) +MODES="tls1 tls1_1 tls12 dtls1 dtls12" # ssl3 not in default config VERIFIES="NO YES" TYPES="ECDSA RSA PSK" FILTER="" # exclude: -# - NULL: excluded from our default config +# - NULL: excluded from our default config + requires OpenSSL legacy # - RC4, single-DES: requires legacy OpenSSL/GnuTLS versions -# avoid plain DES but keep 3DES-EDE-CBC (mbedTLS), DES-CBC3 (OpenSSL) +# - 3DES: not in default config # - ARIA: not in default config.h + requires OpenSSL >= 1.1.1 # - ChachaPoly: requires OpenSSL >= 1.1.0 -# - 3DES: not in default config EXCLUDE='NULL\|DES\|RC4\|ARCFOUR\|ARIA\|CHACHA20-POLY1305' VERBOSE="" MEMCHECK=0