Skip to content

Remove unused context arg #24241

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 2 commits into from
Closed

Remove unused context arg #24241

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb47cb
test: simplify regression test for SEGV
sam-github Nov 8, 2018
ae8029d
tls: remove unused arg to createSecureContext()
sam-github Nov 8, 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
tls: remove unused arg to createSecureContext() 
The context arg is unused by node or its test suites and undocumented.
Remove it.
  • Loading branch information
@sam-github
sam-github committed Nov 8, 2018
commit ae8029da9cf2f0bcdcc7571cc0b54165d2078b29
23 changes: 6 additions & 17 deletions lib/_tls_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,13 @@ const { SSL_OP_CIPHER_SERVER_PREFERENCE } = internalBinding('constants').crypto;
let toBuf = null;

const { SecureContext: NativeSecureContext } = internalBinding('crypto');
function SecureContext(secureProtocol, secureOptions, context) {
function SecureContext(secureProtocol, secureOptions) {
if (!(this instanceof SecureContext)) {
return new SecureContext(secureProtocol, secureOptions, context);
return new SecureContext(secureProtocol, secureOptions);
}

if (context) {
this.context = context;
} else {
this.context = new NativeSecureContext();

if (secureProtocol) {
this.context.init(secureProtocol);
} else {
this.context.init();
}
}
this.context = new NativeSecureContext();
this.context.init(secureProtocol);

if (secureOptions) this.context.setOptions(secureOptions);
}
Expand All @@ -68,19 +59,17 @@ function validateKeyCert(name, value) {
exports.SecureContext = SecureContext;


exports.createSecureContext = function createSecureContext(options, context) {
exports.createSecureContext = function createSecureContext(options) {
if (!options) options = {};

var secureOptions = options.secureOptions;
if (options.honorCipherOrder)
secureOptions |= SSL_OP_CIPHER_SERVER_PREFERENCE;

const c = new SecureContext(options.secureProtocol, secureOptions, context);
const c = new SecureContext(options.secureProtocol, secureOptions);
var i;
var val;

if (context) return c;

// NOTE: It's important to add CA before the cert to be able to load
// cert's issuer in C++ code.
const { ca } = options;
Expand Down