OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

test: remove OpenSSL 1.0.2 error message compat

Browse Source 
While upgrading from OpenSSL 1.0.2 to 1.1.1, these tests were modified
to recognize error messages from both OpenSSL releases. Given that
OpenSSL 1.0.2 has been unsupported for years, it is safe to remove the
older message patterns.

Refs: https://github.com/nodejs/node/pull/16130
PR-URL: https://github.com/nodejs/node/pull/46709
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Tobias Nießen
2023-02-22 07:09:11 +01:00
committed by GitHub
parent a3211e18b4
commit bc58a854e2
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/parallel/test-tls-junk-server.js
View File

@@ -21,9 +21,7 @@ server.listen(0, function() {
req.end();
req.once('error', common.mustCall(function(err) {
// OpenSSL 1.0.x and 1.1.x use different error messages for junk inputs.
assert(/unknown protocol/.test(err.message) ||
/wrong version number/.test(err.message));
assert(/wrong version number/.test(err.message));
server.close();
}));
});

4
test/parallel/test-tls-no-sslv3.js
View File

@@ -42,8 +42,6 @@ process.on('exit', function() {
common.printSkipMessage('`openssl s_client -ssl3` not supported.');
} else {
assert.strictEqual(errors.length, 1);
// OpenSSL 1.0.x and 1.1.x report invalid client versions differently.
assert(/:wrong version number/.test(errors[0].message) ||
/:version too low/.test(errors[0].message));
assert(/:version too low/.test(errors[0].message));
}
});

3
test/parallel/test-tls-server-failed-handshake-emits-clienterror.js
View File

@@ -20,9 +20,8 @@ const server = tls.createServer({})
}).on('tlsClientError', common.mustCall(function(e) {
assert.ok(e instanceof Error,
'Instance of Error should be passed to error handler');
// OpenSSL 1.0.x and 1.1.x use different error codes for junk inputs.
assert.ok(
/SSL routines:[^:]*:(unknown protocol|wrong version number)/.test(
/SSL routines:[^:]*:wrong version number/.test(
e.message),
'Expecting SSL unknown protocol');

3
test/parallel/test-tls-socket-failed-handshake-emits-error.js
View File

@@ -20,9 +20,8 @@ const server = net.createServer(function(c) {
s.on('error', common.mustCall(function(e) {
assert.ok(e instanceof Error,
'Instance of Error should be passed to error handler');
// OpenSSL 1.0.x and 1.1.x use different error codes for junk inputs.
assert.ok(
/SSL routines:[^:]*:(unknown protocol|wrong version number)/.test(
/SSL routines:[^:]*:wrong version number/.test(
e.message),
'Expecting SSL unknown protocol');
}));