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
Prev Previous commit
Next Next commit
fixup! crypto: add ticketKeys option in createSecureContext
  • Loading branch information
@ryzokuken
ryzokuken committed May 26, 2018
commit 38e22dcf3c24f7e52caa3cfdf2260fb098f6aeba
4 changes: 2 additions & 2 deletions lib/_tls_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ function SecureContext(secureProtocol, secureOptions, context) {
if (secureOptions) this.context.setOptions(secureOptions);
}

SecureContext.prototype.getTicketKeys = function getTicketKeys(keys) {
return this.context.getTicketKeys(keys);
SecureContext.prototype.getTicketKeys = function getTicketKeys() {
return this.context.getTicketKeys();
};


Expand Down
22 changes: 22 additions & 0 deletions test/parallel/test-tls-securecontext-ticketkeys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';
const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');
const fixtures = require('../common/fixtures');

const assert = require('assert');
const crypto = require('crypto');
const tls = require('tls');

const keys = crypto.randomBytes(48);
const otherKeys = crypto.randomBytes(48);

const context = tls.createSecureContext({
key: fixtures.readKey('agent1-key.pem'),
cert: fixtures.readKey('agent1-cert.pem'),
ticketKeys: keys
});

assert.strictEqual(context.getTicketKeys(), keys);
context.setTicketKeys(otherKeys);
assert.strictEqual(context.getTicketKeys(), otherKeys);