From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 12 Feb 2025 15:51:13 +0000 (+0100)
Subject: ssl_test.c: Allow using DHE with TLS-1.2 and older versions
X-Git-Tag: openssl-3.5.0-alpha1~508
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0575755eaf9e35406e4e27a00a7505b72465c08d;p=thirdparty%2Fopenssl.git

ssl_test.c: Allow using DHE with TLS-1.2 and older versions

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26715)
---

diff --git a/test/ssl_test.c b/test/ssl_test.c
index ea608518f92..2e2b1b2a36c 100644
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -509,14 +509,18 @@ static int test_handshake(int idx)
         goto err;
 
     if (!SSL_CTX_config(server_ctx, "server")
+        || !SSL_CTX_set_dh_auto(server_ctx, 1)
         || !SSL_CTX_config(client_ctx, "client")) {
         goto err;
     }
 
-    if (server2_ctx != NULL && !SSL_CTX_config(server2_ctx, "server2"))
+    if (server2_ctx != NULL
+        && (!SSL_CTX_config(server2_ctx, "server2")
+            || !SSL_CTX_set_dh_auto(server2_ctx, 1)))
         goto err;
     if (resume_server_ctx != NULL
-        && !SSL_CTX_config(resume_server_ctx, "resume-server"))
+        && (!SSL_CTX_config(resume_server_ctx, "resume-server")
+            || !SSL_CTX_set_dh_auto(resume_server_ctx, 1)))
         goto err;
     if (resume_client_ctx != NULL
         && !SSL_CTX_config(resume_client_ctx, "resume-client"))