Skip to content

Commit fa93bb2

Browse files
richardlauRafaelGSS
authored andcommitted
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: #57477 Refs: openssl/openssl#26734 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Xuguang Mei <meixuguang@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent b2b9eb3 commit fa93bb2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

test/parallel/test-tls-dhe.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ function test(dhparam, keylen, expectedCipher) {
7272

7373
execFile(common.opensslCli, args, common.mustSucceed((stdout) => {
7474
assert(keylen === null ||
75-
stdout.includes(`Server Temp Key: DH, ${keylen} bits`));
75+
// s_client < OpenSSL 3.5
76+
stdout.includes(`Server Temp Key: DH, ${keylen} bits`) ||
77+
// s_client >= OpenSSL 3.5
78+
stdout.includes(`Peer Temp Key: DH, ${keylen} bits`));
7679
assert(stdout.includes(`Cipher : ${expectedCipher}`));
7780
server.close();
7881
}));

0 commit comments

Comments
 (0)