Skip to content

crypto: add ticketKeys option in createSecureContext #20916

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
ryzokuken wants to merge 4 commits into from
Closed

crypto: add ticketKeys option in createSecureContext #20916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2594cd2
crypto: add ticketKeys option in createSecureContext
ryzokuken May 23, 2018
6269853
fixup! crypto: add ticketKeys option in createSecureContext
ryzokuken May 24, 2018
38e22dc
fixup! crypto: add ticketKeys option in createSecureContext
ryzokuken May 26, 2018
3964032
fixup! crypto: add ticketKeys option in createSecureContext
ryzokuken May 26, 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
5 changes: 5 additions & 0 deletions lib/_tls_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,11 @@ exports.createSecureContext = function createSecureContext(options, context) {
options.clientCertEngine);
}

// Set ticketKeys right inside createSecureContext
Copy link
Member

@bnoordhuis bnoordhuis May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Superfluous comment.

Copy link
Contributor Author

@ryzokuken ryzokuken May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will remove it, in that case.

if (options.ticketKeys) {
c.context.setTicketKeys(options.ticketKeys);
}

return c;
};

Expand Down
7 changes: 2 additions & 5 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,8 @@ function Server(options, listener) {
secureOptions: this.secureOptions,
honorCipherOrder: this.honorCipherOrder,
crl: this.crl,
sessionIdContext: this.sessionIdContext
sessionIdContext: this.sessionIdContext,
ticketKeys: this.ticketKeys
Copy link
Member

@bnoordhuis bnoordhuis May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a trailing comma?

Copy link
Contributor Author

@ryzokuken ryzokuken May 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I certainly will! I didn't add one because there wasn't one to begin with 😅

});

this[kHandshakeTimeout] = options.handshakeTimeout || (120 * 1000);
Expand All @@ -900,10 +901,6 @@ function Server(options, listener) {
this._sharedCreds.context.setSessionTimeout(this.sessionTimeout);
}

if (this.ticketKeys) {
this._sharedCreds.context.setTicketKeys(this.ticketKeys);
}

// constructor call
net.Server.call(this, tlsConnectionListener);

Expand Down