From 8f62ea279ca1a3aa1244f42feabd8d73c44735ec Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Mon, 17 Mar 2025 03:42:55 +0000 Subject: [PATCH] [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. PR-URL: https://github.com/nodejs/node/pull/57477 Refs: https://github.com/openssl/openssl/pull/26734 Reviewed-By: Antoine du Hamel Reviewed-By: Colin Ihrig Reviewed-By: Xuguang Mei Reviewed-By: Luigi Pinca Gbp-Pq: Topic build Gbp-Pq: Name test-update-parallel-test-tls-dhe-for-OpenSSL-3.5.patch --- 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 21739ce42..ce302f623 100644 --- a/test/parallel/test-tls-dhe.js +++ b/test/parallel/test-tls-dhe.js @@ -72,7 +72,10 @@ function test(dhparam, keylen, expectedCipher) { execFile(common.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(); })); -- 2.30.2