Merge remote-tracking branch 'upstream-public/pr/2786' into mbedtls-2.16

This commit is contained in:
Gilles Peskine 2019-08-14 15:57:58 +02:00
commit f85f49dcbd

View file

@ -216,14 +216,13 @@ filter_ciphersuites()
G_CIPHERS=$( filter "$G_CIPHERS" )
fi
# OpenSSL 1.0.1h doesn't support DTLS 1.2
if [ `minor_ver "$MODE"` -ge 3 ] && is_dtls "$MODE"; then
# OpenSSL <1.0.2 doesn't support DTLS 1.2. Check what OpenSSL
# supports from the s_server help. (The s_client help isn't
# accurate as of 1.0.2g: it supports DTLS 1.2 but doesn't list it.
# But the s_server help seems to be accurate.)
if ! $OPENSSL_CMD s_server -help 2>&1 | grep -q "^ *-$MODE "; then
M_CIPHERS=""
O_CIPHERS=""
case "$PEER" in
[Oo]pen*)
M_CIPHERS=""
;;
esac
fi
# For GnuTLS client -> mbed TLS server,