Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support additional tls.connect() options #1996

Merged
merged 5 commits into from Nov 19, 2019
Merged

Support additional tls.connect() options #1996

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb1eb64
Support additional tls.connect() options
jgeurts Oct 22, 2019
61392ba
Pass-through all ssl options to tls.connect()
jgeurts Nov 11, 2019
582fab9
Merge remote-tracking branch 'upstream/master' into tls-options
jgeurts Nov 11, 2019
8bc1e83
Fix lint error
jgeurts Nov 11, 2019
319f7d8
Remove tls.checkServerIdentity explicit option
jgeurts Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 3 additions & 11 deletions lib/connection.js
View file
Open in desktop
Expand Up @@ -91,18 +91,10 @@ 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 = {
const options = Object.assign({
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
}
checkServerIdentity: tls.checkServerIdentity
charmander marked this conversation as resolved.
Show resolved Hide resolved
}, self.ssl)
if (net.isIP(host) === 0) {
options.servername = host
}
Expand Down