From fea3d0a3d04f9c40cbfb81fc951b56e27482809a Mon Sep 17 00:00:00 2001 From: Andres Amaya Garcia Date: Tue, 19 Feb 2019 20:20:57 +0000 Subject: [PATCH] Adjust DES exclude lists in test scripts --- tests/compat.sh | 2 +- tests/scripts/all.sh | 2 +- tests/scripts/basic-build-test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/compat.sh b/tests/compat.sh index 4db414de1..df499dcf0 100755 --- a/tests/compat.sh +++ b/tests/compat.sh @@ -58,7 +58,7 @@ FILTER="" # - 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 -EXCLUDE='NULL\|DES-CBC-\|RC4\|3DES\|ARCFOUR' +EXCLUDE='NULL\|DES\|RC4\|ARCFOUR' VERBOSE="" MEMCHECK=0 PEERS="OpenSSL$PEER_GNUTLS mbedTLS" diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index d9b6074e5..a37e11367 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -682,7 +682,7 @@ component_test_full_cmake_clang () { if_build_succeeded tests/ssl-opt.sh -f Default msg "test: compat.sh RC4, DES, 3DES & NULL (full config)" # ~ 2 min - if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e 'DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR' + if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e '^$' -f 'NULL\|DES\|RC4\|ARCFOUR' } component_build_deprecated () { diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index d3c54719a..97120ea84 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh @@ -91,7 +91,7 @@ OPENSSL_CMD="$OPENSSL_LEGACY" \ OPENSSL_CMD="$OPENSSL_LEGACY" \ GNUTLS_CLI="$GNUTLS_LEGACY_CLI" \ GNUTLS_SERV="$GNUTLS_LEGACY_SERV" \ - sh compat.sh -e 'DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR' | \ + sh compat.sh -e '^$' -f 'NULL\|DES\|RC4\|ARCFOUR' | \ tee -a compat-test-$TEST_OUTPUT echo