Commit 27b01ed
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
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -85,7 +85,10 @@ function test(dhparam, keylen, expectedCipher) { | |||
| 85 | 85 | ||
| 86 | 86 | execFile(opensslCli, args, common.mustSucceed((stdout) => { | |
| 87 | 87 | 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`)); | ||
| 89 | 92 | assert(stdout.includes(`Cipher : ${expectedCipher}`)); | |
| 90 | 93 | server.close(); | |
| 91 | 94 | })); | |
0 commit comments