Skip to content

Commit 533170d

Browse files
tniessendanielleadams
authored andcommitted
test: remove OpenSSL 1.0.2 error message compat
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: #16130 PR-URL: #46709 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Filip Skokan <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 4b25b98 commit 533170d

4 files changed

+4
-10
lines changed

test/parallel/test-tls-junk-server.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ server.listen(0, function() {
2121
req.end();
2222

2323
req.once('error', common.mustCall(function(err) {
24-
// OpenSSL 1.0.x and 1.1.x use different error messages for junk inputs.
25-
assert(/unknown protocol/.test(err.message) ||
26-
/wrong version number/.test(err.message));
24+
assert(/wrong version number/.test(err.message));
2725
server.close();
2826
}));
2927
});

test/parallel/test-tls-no-sslv3.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ process.on('exit', function() {
4242
common.printSkipMessage('`openssl s_client -ssl3` not supported.');
4343
} else {
4444
assert.strictEqual(errors.length, 1);
45-
// OpenSSL 1.0.x and 1.1.x report invalid client versions differently.
46-
assert(/:wrong version number/.test(errors[0].message) ||
47-
/:version too low/.test(errors[0].message));
45+
assert(/:version too low/.test(errors[0].message));
4846
}
4947
});

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ const server = tls.createServer({})
2020
}).on('tlsClientError', common.mustCall(function(e) {
2121
assert.ok(e instanceof Error,
2222
'Instance of Error should be passed to error handler');
23-
// OpenSSL 1.0.x and 1.1.x use different error codes for junk inputs.
2423
assert.ok(
25-
/SSL routines:[^:]*:(unknown protocol|wrong version number)/.test(
24+
/SSL routines:[^:]*:wrong version number/.test(
2625
e.message),
2726
'Expecting SSL unknown protocol');
2827

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ const server = net.createServer(function(c) {
2020
s.on('error', common.mustCall(function(e) {
2121
assert.ok(e instanceof Error,
2222
'Instance of Error should be passed to error handler');
23-
// OpenSSL 1.0.x and 1.1.x use different error codes for junk inputs.
2423
assert.ok(
25-
/SSL routines:[^:]*:(unknown protocol|wrong version number)/.test(
24+
/SSL routines:[^:]*:wrong version number/.test(
2625
e.message),
2726
'Expecting SSL unknown protocol');
2827
}));

0 commit comments

Comments
 (0)