Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Mar 17, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
  • Loading branch information
@richardlau
richardlau committed Mar 15, 2025
commit a75d6b52cf92595879ab644ddbe17b0d3598ccd6
5 changes: 4 additions & 1 deletion test/parallel/test-tls-dhe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}));
Expand Down