Skip to content

Commit 419bd00

Browse files
Andres Amaya Garciampg
authored andcommitted
Adjust DES exclude lists in test scripts
1 parent f8dffb3 commit 419bd00

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tests/compat.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ FILTER=""
6363
# - ARIA: not in default config.h + requires OpenSSL >= 1.1.1
6464
# - ChachaPoly: requires OpenSSL >= 1.1.0
6565
# - 3DES: not in default config
66-
EXCLUDE='NULL\|DES-CBC-\|RC4\|3DES\|ARCFOUR\|ARIA\|CHACHA20-POLY1305'
66+
EXCLUDE='NULL\|DES\|RC4\|ARCFOUR\|ARIA\|CHACHA20-POLY1305'
6767
VERBOSE=""
6868
MEMCHECK=0
6969
PEERS="OpenSSL$PEER_GNUTLS mbedTLS"

tests/scripts/all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ component_test_full_cmake_clang () {
731731
if_build_succeeded tests/ssl-opt.sh -f 'Default\|ECJPAKE\|SSL async private'
732732

733733
msg "test: compat.sh RC4, DES, 3DES & NULL (full config)" # ~ 2 min
734-
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'
734+
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'
735735

736736
msg "test: compat.sh ARIA + ChachaPoly"
737737
if_build_succeeded env OPENSSL_CMD="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'

tests/scripts/basic-build-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ OPENSSL_CMD="$OPENSSL_LEGACY" \
9191
OPENSSL_CMD="$OPENSSL_LEGACY" \
9292
GNUTLS_CLI="$GNUTLS_LEGACY_CLI" \
9393
GNUTLS_SERV="$GNUTLS_LEGACY_SERV" \
94-
sh compat.sh -e 'DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR' | \
94+
sh compat.sh -e '^$' -f 'NULL\|DES\|RC4\|ARCFOUR' | \
9595
tee -a compat-test-$TEST_OUTPUT
9696
OPENSSL_CMD="$OPENSSL_NEXT" \
9797
sh compat.sh -e '^$' -f 'ARIA\|CHACHA' | \

0 commit comments

Comments
 (0)