Skip to content

Remove dead TLS code, and fix some misnamed variables #25153

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

Closed
sam-github wants to merge 5 commits into from
Closed

Remove dead TLS code, and fix some misnamed variables #25153

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd12dc9
tls: remove unused ocsp extension parsing
sam-github Dec 19, 2018
f309cec
tls: fix initRead socket argument name
sam-github Dec 19, 2018
2e526ce
tls: do not confuse TLSSocket and Socket
sam-github Dec 19, 2018
c25afe9
tls: do not confuse session and session ID
sam-github Dec 19, 2018
fe15429
src: use consistent names for JSStream
sam-github Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tls: do not confuse TLSSocket and Socket 
Don't use "socket" to describe two different objects in the same
function.
  • Loading branch information
@sam-github
sam-github committed Dec 27, 2018
commit 2e526ce8d971a4069bf43c339738a84f5962305b
24 changes: 13 additions & 11 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ exports.connect = function connect(...args) {

const context = options.secureContext || tls.createSecureContext(options);

var socket = new TLSSocket(options.socket, {
var tlssock = new TLSSocket(options.socket, {
pipe: !!options.path,
secureContext: context,
isServer: false,
Expand All @@ -1238,12 +1238,14 @@ exports.connect = function connect(...args) {
requestOCSP: options.requestOCSP
});

socket[kConnectOptions] = options;
tlssock[kConnectOptions] = options;

if (cb)
socket.once('secureConnect', cb);
tlssock.once('secureConnect', cb);

if (!options.socket) {
// If user provided the socket, its their responsibility to manage its
// connectivity. If we created one internally, we connect it.
const connectOpt = {
path: options.path,
port: options.port,
Expand All @@ -1252,13 +1254,13 @@ exports.connect = function connect(...args) {
localAddress: options.localAddress,
lookup: options.lookup
};
socket.connect(connectOpt, socket._start);
tlssock.connect(connectOpt, tlssock._start);
}

socket._releaseControl();
tlssock._releaseControl();

if (options.session)
socket.setSession(options.session);
tlssock.setSession(options.session);

if (options.servername) {
if (!ipServernameWarned && net.isIP(options.servername)) {
Expand All @@ -1270,14 +1272,14 @@ exports.connect = function connect(...args) {
);
ipServernameWarned = true;
}
socket.setServername(options.servername);
tlssock.setServername(options.servername);
}

if (options.socket)
socket._start();
tlssock._start();

socket.on('secure', onConnectSecure);
socket.once('end', onConnectEnd);
tlssock.on('secure', onConnectSecure);
tlssock.once('end', onConnectEnd);

return socket;
return tlssock;
};