Merge pull request #5737 from mpg/clean-compat-sh-2.28

[backport 2.28] clean up compat.sh
This commit is contained in:
Gilles Peskine 2022-04-14 14:04:34 +02:00 committed by GitHub
commit 37f6d01b94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View file

@ -67,17 +67,19 @@ else
fi fi
# default values for options # 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" VERIFIES="NO YES"
TYPES="ECDSA RSA PSK" TYPES="ECDSA RSA PSK"
FILTER="" FILTER=""
# exclude: # exclude:
# - NULL: excluded from our default config # - NULL: excluded from our default config + requires OpenSSL legacy
# - 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) # - 3DES: not in default config
# - ARIA: not in default config.h + requires OpenSSL >= 1.1.1 # - ARIA: not in default config.h + requires OpenSSL >= 1.1.1
# - ChachaPoly: requires OpenSSL >= 1.1.0 # - ChachaPoly: requires OpenSSL >= 1.1.0
# - 3DES: not in default config
EXCLUDE='NULL\|DES\|RC4\|ARCFOUR\|ARIA\|CHACHA20-POLY1305' EXCLUDE='NULL\|DES\|RC4\|ARCFOUR\|ARIA\|CHACHA20-POLY1305'
VERBOSE="" VERBOSE=""
MEMCHECK=0 MEMCHECK=0

View file

@ -121,7 +121,7 @@ echo
echo '################ compat.sh ################' echo '################ compat.sh ################'
{ {
echo '#### compat.sh: Default versions' 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
echo '#### compat.sh: legacy (SSLv3)' echo '#### compat.sh: legacy (SSLv3)'