test: remove OpenSSL 1.0.2 error message compat

tniessen · danielleadams · commit 533170d4565e · 2023-04-05T12:52:23.000-04:00
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 <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>
diff --git a/test/parallel/test-tls-junk-server.js b/test/parallel/test-tls-junk-server.js
@@ -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();
   }));
 });
diff --git a/test/parallel/test-tls-no-sslv3.js b/test/parallel/test-tls-no-sslv3.js
@@ -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));
   }
 });
diff --git a/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js b/test/parallel/test-tls-server-failed-handshake-emits-clienterror.js
@@ -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');
 
diff --git a/test/parallel/test-tls-socket-failed-handshake-emits-error.js b/test/parallel/test-tls-socket-failed-handshake-emits-error.js
@@ -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');
     }));
