eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust DES exclude lists in test scripts

Browse source
This commit is contained in:
Andres Amaya Garcia 2019-02-19 20:20:57 +00:00 • committed by Manuel Pégourié-Gonnard
parent 493a0dc333
commit fea3d0a3d0
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/compat.sh
View file

@ -58,7 +58,7 @@ FILTER=""
# - RC4, single-DES: requires legacy OpenSSL/GnuTLS versions # - RC4, single-DES: requires legacy OpenSSL/GnuTLS versions
# avoid plain DES but keep 3DES-EDE-CBC (mbedTLS), DES-CBC3 (OpenSSL) # avoid plain DES but keep 3DES-EDE-CBC (mbedTLS), DES-CBC3 (OpenSSL)
# - 3DES: not in default config # - 3DES: not in default config
EXCLUDE='NULL\|DES-CBC-\|RC4\|3DES\|ARCFOUR' EXCLUDE='NULL\|DES\|RC4\|ARCFOUR'
VERBOSE="" VERBOSE=""
MEMCHECK=0 MEMCHECK=0
PEERS="OpenSSL$PEER_GNUTLS mbedTLS" PEERS="OpenSSL$PEER_GNUTLS mbedTLS"

2
tests/scripts/all.sh
View file

@ -682,7 +682,7 @@ component_test_full_cmake_clang () {
if_build_succeeded tests/ssl-opt.sh -f Default if_build_succeeded tests/ssl-opt.sh -f Default
msg "test: compat.sh RC4, DES, 3DES & NULL (full config)" # ~ 2 min 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 () { component_build_deprecated () {

2
tests/scripts/basic-build-test.sh
View file

@ -91,7 +91,7 @@ OPENSSL_CMD="$OPENSSL_LEGACY" \
OPENSSL_CMD="$OPENSSL_LEGACY" \ OPENSSL_CMD="$OPENSSL_LEGACY" \
GNUTLS_CLI="$GNUTLS_LEGACY_CLI" \ GNUTLS_CLI="$GNUTLS_LEGACY_CLI" \
GNUTLS_SERV="$GNUTLS_LEGACY_SERV" \ 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 tee -a compat-test-$TEST_OUTPUT
echo echo