From bf029c827049ca16add0a862d40f4e60dfd9e602 Mon Sep 17 00:00:00 2001 From: Jim Geurts Date: Tue, 19 Nov 2019 10:10:19 -0600 Subject: [PATCH] Support additional tls.connect() options (#1996) * Support additional tls.connect() options * Pass-through all ssl options to tls.connect() * Fix lint error * Remove tls.checkServerIdentity explicit option --- lib/connection.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/connection.js b/lib/connection.js index 5ca746a79..cdcb0cbb3 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -91,18 +91,9 @@ 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 = { - 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 - } + const options = Object.assign({ + socket: self.stream + }, self.ssl) if (net.isIP(host) === 0) { options.servername = host }