From 6b9d4775202bce439dc7d463ac969fe0e41c2cc8 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Fri, 7 Jun 2019 07:22:19 +0200
Subject: [PATCH] tls: rename validateKeyCert in _tls_common.js

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>
---
 lib/_tls_common.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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