diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 5cbf19ed63..5d9ccbe350 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1031,8 +1031,7 @@ component_test_sslv3 () { make test msg "build: SSLv3 - compat.sh (ASan build)" # ~ 6 min - tests/compat.sh -m 'tls1 tls1_1 tls12 dtls1 dtls12' - env OPENSSL="$OPENSSL_LEGACY" tests/compat.sh -m 'ssl3' + tests/compat.sh -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' msg "build: SSLv3 - ssl-opt.sh (ASan build)" # ~ 6 min tests/ssl-opt.sh @@ -1590,8 +1589,11 @@ component_test_full_cmake_clang () { msg "test: ssl-opt.sh default, ECJPAKE, SSL async (full config)" # ~ 1s tests/ssl-opt.sh -f 'Default\|ECJPAKE\|SSL async private' - msg "test: compat.sh RC4, DES, 3DES & NULL (full config)" # ~ 2 min - env OPENSSL="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e '^$' -f 'NULL\|DES\|RC4\|ARCFOUR' + msg "test: compat.sh RC4, 3DES & NULL (full config)" # ~ 2min + tests/compat.sh -e '^$' -f 'NULL\|3DES\|DES-CBC3\|RC4\|ARCFOUR' + + msg "test: compat.sh single-DES (full config)" # ~ 30s + env OPENSSL="$OPENSSL_LEGACY" tests/compat.sh -e '3DES\|DES-CBC3' -f 'DES' msg "test: compat.sh ARIA + ChachaPoly" env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' @@ -1881,8 +1883,11 @@ component_test_no_use_psa_crypto_full_cmake_asan() { msg "test: compat.sh default (full minus MBEDTLS_USE_PSA_CRYPTO)" tests/compat.sh - msg "test: compat.sh RC4, DES & NULL (full minus MBEDTLS_USE_PSA_CRYPTO)" - env OPENSSL="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR' + msg "test: compat.sh RC4, 3DES & NULL (full minus MBEDTLS_USE_PSA_CRYPTO)" + tests/compat.sh -e '^$' -f 'NULL\|3DES\|DES-CBC3\|RC4\|ARCFOUR' + + msg "test: compat.sh single-DES (full minus MBEDTLS_USE_PSA_CRYPTO)" + env OPENSSL="$OPENSSL_LEGACY" tests/compat.sh -e '3DES\|DES-CBC3' -f 'DES' msg "test: compat.sh ARIA + ChachaPoly (full minus MBEDTLS_USE_PSA_CRYPTO)" env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index abc4a2fba9..5ea1f83239 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh @@ -120,12 +120,8 @@ echo # Step 2c - Compatibility tests (keep going even if some tests fail) echo '################ compat.sh ################' { - echo '#### compat.sh: Default versions' - sh compat.sh -m 'tls1 tls1_1 tls12 dtls1 dtls12' - echo - - echo '#### compat.sh: legacy (SSLv3)' - OPENSSL="$OPENSSL_LEGACY" sh compat.sh -m 'ssl3' + echo '#### compat.sh: Default ciphers' + sh compat.sh -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' echo echo '#### compat.sh: legacy (null, DES, RC4)'