Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 27b01ed

Browse filesBrowse files
richardlauaduh95
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 52cd095 commit 27b01ed
Copy full SHA for 27b01ed

File tree

Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-1
lines changed
Open diff view settings
Collapse file

‎test/parallel/test-tls-dhe.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-tls-dhe.js
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ function test(dhparam, keylen, expectedCipher) {
8585

8686
execFile(opensslCli, args, common.mustSucceed((stdout) => {
8787
assert(keylen === null ||
88-
stdout.includes(`Server Temp Key: DH, ${keylen} bits`));
88+
// s_client < OpenSSL 3.5
89+
stdout.includes(`Server Temp Key: DH, ${keylen} bits`) ||
90+
// s_client >= OpenSSL 3.5
91+
stdout.includes(`Peer Temp Key: DH, ${keylen} bits`));
8992
assert(stdout.includes(`Cipher : ${expectedCipher}`));
9093
server.close();
9194
}));

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.