test: update parallel/test-tls-dhe for OpenSSL 3.5

nodejs22.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 14 09:19:08 UTC 2025 - Angel Yankov <angel.yankov@suse.com>
+
+- test: update parallel/test-tls-dhe for OpenSSL 3.5 
+  * The output of the s_client command invoked by the test has changed in the OpenSSL 3.5.0 
+  * Add openssl-test-tls-dhe.patch
+
 -------------------------------------------------------------------
 Thu Apr 10 09:47:03 UTC 2025 - Adam Majer <adam.majer@suse.de>
 

nodejs22.spec

@@ -173,6 +173,7 @@ Patch305:       qemu_timeouts_arches.patch
 Patch307:       v8-i586.patch
 Patch309:       gcc13.patch
 Patch311:       old_cares.patch
+Patch312:	openssl-test-tls-dhe.patch
 
 BuildRequires:  pkg-config
 BuildRequires:  fdupes
@@ -703,6 +704,7 @@ popd
 %patch -P 307 -p1
 %patch -P 309 -p1
 %patch -P 311 -p1
+%patch -P 312 -p1
 
 %if %{node_version_number} == 12
 # minimist security update - patch50

openssl-test-tls-dhe.patch

@@ -0,0 +1,30 @@
+From a75d6b52cf92595879ab644ddbe17b0d3598ccd6 Mon Sep 17 00:00:00 2001
+From: Richard Lau <rlau@redhat.com>
+Date: Sat, 15 Mar 2025 03:18:23 +0000
+Subject: [PATCH] test: update parallel/test-tls-dhe for OpenSSL 3.5
+
+The output of the `s_client` command invoked by the test has changed
+in the OpenSSL 3.5.0 version of `s_client`. Update the test so that
+it works with both the old and new output -- the `s_client` binary
+being run may not be at the exact same version of OpenSSL as used
+by Node.js so the updated test allows either output.
+---
+ test/parallel/test-tls-dhe.js | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/parallel/test-tls-dhe.js b/test/parallel/test-tls-dhe.js
+index b4f0337c43fa57..89cda5f52a6b31 100644
+--- a/test/parallel/test-tls-dhe.js
++++ b/test/parallel/test-tls-dhe.js
+@@ -85,7 +85,10 @@ function test(dhparam, keylen, expectedCipher) {
+ 
+     execFile(opensslCli, args, common.mustSucceed((stdout) => {
+       assert(keylen === null ||
+-             stdout.includes(`Server Temp Key: DH, ${keylen} bits`));
++             // s_client < OpenSSL 3.5
++             stdout.includes(`Server Temp Key: DH, ${keylen} bits`) ||
++             // s_client >= OpenSSL 3.5
++             stdout.includes(`Peer Temp Key: DH, ${keylen} bits`));
+       assert(stdout.includes(`Cipher    : ${expectedCipher}`));
+       server.close();
+     }));