From 80e0d46062acdad669f45514af5393bd39f7e370 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 13 Oct 2017 16:51:54 +0100 Subject: [PATCH] Use 2048-bit DHE parameters from RFC 3526 instead of 5114 by default The parameters from RFC 5114 are not considered trustworthy, while those from RFC 3526 have been generated in a nothing-up-my-sleeve manner. --- library/ssl_tls.c | 4 ++-- tests/ssl-opt.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index ba586a05e..9986ddcc9 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -7268,8 +7268,8 @@ int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf, if( endpoint == MBEDTLS_SSL_IS_SERVER ) { if( ( ret = mbedtls_ssl_conf_dh_param( conf, - MBEDTLS_DHM_RFC5114_MODP_2048_P, - MBEDTLS_DHM_RFC5114_MODP_2048_G ) ) != 0 ) + MBEDTLS_DHM_RFC3526_MODP_2048_P, + MBEDTLS_DHM_RFC3526_MODP_2048_G ) ) != 0 ) { return( ret ); } diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 9c9cf4651..a8c975036 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -2702,7 +2702,7 @@ run_test "DHM parameters: reference" \ debug_level=3" \ 0 \ -c "value of 'DHM: P ' (2048 bits)" \ - -c "value of 'DHM: G ' (2048 bits)" + -c "value of 'DHM: G ' (2 bits)" run_test "DHM parameters: other parameters" \ "$P_SRV dhm_file=data_files/dhparams.pem" \