mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-06-05 21:15:16 +00:00
Merge pull request #10663 from yiwu0b11/remove_unused_ffdh_code
Remove FFDH-specific code from compat.sh
This commit is contained in:
@@ -541,19 +541,6 @@ setup_arguments()
|
|||||||
G_SERVER_ARGS="-p $PORT --http $G_MODE"
|
G_SERVER_ARGS="-p $PORT --http $G_MODE"
|
||||||
G_SERVER_PRIO="NORMAL:${G_PRIO_CCM}+NULL:+MD5:+PSK:+ECDHE-PSK:+SHA256:+SHA384:-VERS-TLS-ALL:$G_PRIO_MODE"
|
G_SERVER_PRIO="NORMAL:${G_PRIO_CCM}+NULL:+MD5:+PSK:+ECDHE-PSK:+SHA256:+SHA384:-VERS-TLS-ALL:$G_PRIO_MODE"
|
||||||
|
|
||||||
# The default prime for `openssl s_server` depends on the version:
|
|
||||||
# * OpenSSL <= 1.0.2a: 512-bit
|
|
||||||
# * OpenSSL 1.0.2b to 1.1.1b: 1024-bit
|
|
||||||
# * OpenSSL >= 1.1.1c: 2048-bit
|
|
||||||
# Mbed TLS wants >=1024, so force that for older versions. Don't force
|
|
||||||
# it for newer versions, which reject a 1024-bit prime. Indifferently
|
|
||||||
# force it or not for intermediate versions.
|
|
||||||
case $($OPENSSL version) in
|
|
||||||
"OpenSSL 1.0"*)
|
|
||||||
O_SERVER_ARGS="$O_SERVER_ARGS -dhparam $DATA_FILES_PATH/dhparams.pem"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# with OpenSSL 1.0.1h, -www, -WWW and -HTTP break DTLS handshakes
|
# with OpenSSL 1.0.1h, -www, -WWW and -HTTP break DTLS handshakes
|
||||||
if is_dtls "$MODE"; then
|
if is_dtls "$MODE"; then
|
||||||
O_SERVER_ARGS="$O_SERVER_ARGS"
|
O_SERVER_ARGS="$O_SERVER_ARGS"
|
||||||
|
|||||||
Reference in New Issue
Block a user