From 510a273ce45fb73d0355cf384e97ea695c8a5bcc Mon Sep 17 00:00:00 2001 From: Brian C Date: Wed, 20 Nov 2019 10:12:02 -0600 Subject: [PATCH] Revert "Support additional tls.connect() options (#1996)" (#2010) This reverts commit bf029c827049ca16add0a862d40f4e60dfd9e602. --- lib/connection.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/connection.js b/lib/connection.js index cdcb0cbb3..5ca746a79 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -91,9 +91,18 @@ Connection.prototype.connect = function (port, host) { return self.emit('error', new Error('There was an error establishing an SSL connection')) } var tls = require('tls') - const options = Object.assign({ - socket: self.stream - }, self.ssl) + const options = { + socket: self.stream, + checkServerIdentity: self.ssl.checkServerIdentity || tls.checkServerIdentity, + rejectUnauthorized: self.ssl.rejectUnauthorized, + ca: self.ssl.ca, + pfx: self.ssl.pfx, + key: self.ssl.key, + passphrase: self.ssl.passphrase, + cert: self.ssl.cert, + secureOptions: self.ssl.secureOptions, + NPNProtocols: self.ssl.NPNProtocols + } if (net.isIP(host) === 0) { options.servername = host }