1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tls: rename validateKeyCert in _tls_common.js

Browse Source 
This commit renames validateKeyCert to validateKeyCertArg to avoid
confusing this with something that would validate the actual key or
certificate.

PR-URL: https://github.com/nodejs/node/pull/28116
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Daniel Bevenius 2019-06-07 07:22:19 +02:00 committed by Rich Trott
parent 0640526303
commit 173bee230e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/_tls_common.js
View File

@ -75,7 +75,7 @@ function SecureContext(secureProtocol, secureOptions, minVersion, maxVersion) {
if (secureOptions) this.context.setOptions(secureOptions); if (secureOptions) this.context.setOptions(secureOptions);
} }
function validateKeyCert(name, value) { function validateKeyOrCertOption(name, value) {
if (typeof value !== 'string' && !isArrayBufferView(value)) { if (typeof value !== 'string' && !isArrayBufferView(value)) {
throw new ERR_INVALID_ARG_TYPE( throw new ERR_INVALID_ARG_TYPE(
`options.${name}`, `options.${name}`,
@ -107,11 +107,11 @@ exports.createSecureContext = function createSecureContext(options) {
if (Array.isArray(ca)) { if (Array.isArray(ca)) {
for (i = 0; i < ca.length; ++i) { for (i = 0; i < ca.length; ++i) {
val = ca[i]; val = ca[i];
validateKeyCert('ca', val); validateKeyOrCertOption('ca', val);
c.context.addCACert(val); c.context.addCACert(val);
} }
} else { } else {
validateKeyCert('ca', ca); validateKeyOrCertOption('ca', ca);
c.context.addCACert(ca); c.context.addCACert(ca);
} }
} else { } else {
@ -123,11 +123,11 @@ exports.createSecureContext = function createSecureContext(options) {
if (Array.isArray(cert)) { if (Array.isArray(cert)) {
for (i = 0; i < cert.length; ++i) { for (i = 0; i < cert.length; ++i) {
val = cert[i]; val = cert[i];
validateKeyCert('cert', val); validateKeyOrCertOption('cert', val);
c.context.setCert(val); c.context.setCert(val);
} }
} else { } else {
validateKeyCert('cert', cert); validateKeyOrCertOption('cert', cert);
c.context.setCert(cert); c.context.setCert(cert);
} }
} }
@ -144,11 +144,11 @@ exports.createSecureContext = function createSecureContext(options) {
val = key[i]; val = key[i];
// eslint-disable-next-line eqeqeq // eslint-disable-next-line eqeqeq
const pem = (val != undefined && val.pem !== undefined ? val.pem : val); const pem = (val != undefined && val.pem !== undefined ? val.pem : val);
validateKeyCert('key', pem); validateKeyOrCertOption('key', pem);
c.context.setKey(pem, val.passphrase || passphrase); c.context.setKey(pem, val.passphrase || passphrase);
} }
} else { } else {
validateKeyCert('key', key); validateKeyOrCertOption('key', key);
c.context.setKey(key, passphrase); c.context.setKey(key, passphrase);
} }
} }