test: remove workaround for unsupported OpenSSLs

sam-github · BridgeAR · commit 14bd26c8dad7 · 2019-06-17T21:12:13.000+02:00
Workaround added in d9b9229 is no longer needed, since OpenSSL versions lower than 1.1.1 are unsupported. PR-URL: #28085 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/test/parallel/test-https-agent-session-eviction.js b/test/parallel/test-https-agent-session-eviction.js
@@ -7,10 +7,8 @@ const { readKey } = require('../common/fixtures');
 if (!common.hasCrypto)
   common.skip('missing crypto');
 
-const assert = require('assert');
 const https = require('https');
-const { OPENSSL_VERSION_NUMBER, SSL_OP_NO_TICKET } =
-    require('crypto').constants;
+const { SSL_OP_NO_TICKET } = require('crypto').constants;
 
 const options = {
   key: readKey('agent1-key.pem'),
@@ -60,38 +58,12 @@ function second(server, session) {
     res.resume();
   });
 
-  if (OPENSSL_VERSION_NUMBER >= 0x10100000) {
-    // Although we have a TLS 1.2 session to offer to the TLS 1.0 server,
-    // connection to the TLS 1.0 server should work.
-    req.on('response', common.mustCall(function(res) {
-      // The test is now complete for OpenSSL 1.1.0.
-      server.close();
-    }));
-  } else {
-    // OpenSSL 1.0.x mistakenly locked versions based on the session it was
-    // offering. This causes this sequent request to fail. Let it fail, but
-    // test that this is mitigated on the next try by invalidating the session.
-    req.on('error', common.mustCall(function(err) {
-      assert(/wrong version number/.test(err.message));
-
-      req.on('close', function() {
-        third(server);
-      });
-    }));
-  }
-  req.end();
-}
-
-// Try one more time - session should be evicted!
-function third(server) {
-  const req = https.request({
-    port: server.address().port,
-    rejectUnauthorized: false
-  }, function(res) {
-    res.resume();
-    assert(!req.socket.isSessionReused());
+  // Although we have a TLS 1.2 session to offer to the TLS 1.0 server,
+  // connection to the TLS 1.0 server should work.
+  req.on('response', common.mustCall(function(res) {
+    // The test is now complete for OpenSSL 1.1.0.
     server.close();
-  });
-  req.on('error', common.mustNotCall());
+  }));
+
   req.end();
 }
