tls: tweak clientCertEngine argument parsing

codebytere · targos · commit 379b5f79a9e9 · 2021-06-11T07:24:54.000+02:00
PR-URL: #38900 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/tls.js b/lib/internal/tls.js
@@ -305,15 +305,15 @@ function configSecureContext(context, options ={}, name = 'options'){
 }
 }
 
- if (clientCertEngine !== undefined){
+ if (typeof clientCertEngine === 'string'){
 if (typeof context.setClientCertEngine !== 'function')
 throw new ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED();
- if (typeof clientCertEngine !== 'string'){
- throw new ERR_INVALID_ARG_TYPE(`${name}.clientCertEngine`,
- ['string', 'null', 'undefined'],
- clientCertEngine);
- }
- context.setClientCertEngine(clientCertEngine);
+ else
+ context.setClientCertEngine(clientCertEngine);
+ } else if (clientCertEngine !== undefined){
+ throw new ERR_INVALID_ARG_TYPE(`${name}.clientCertEngine`,
+ ['string', 'null', 'undefined'],
+ clientCertEngine);
 }
 
 if (ticketKeys !== undefined){

-Original file line number
+Diff line change
+}
+}
 -if(clientCertEngine!==undefined){
 +if(typeofclientCertEngine==='string'){
 if(typeofcontext.setClientCertEngine!=='function')
 thrownewERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED();
 -if(typeofclientCertEngine!=='string'){
 -thrownewERR_INVALID_ARG_TYPE(`${name}.clientCertEngine`,
 -['string','null','undefined'],
 -clientCertEngine);
 -}
 -context.setClientCertEngine(clientCertEngine);
 +else
 +context.setClientCertEngine(clientCertEngine);
 +}elseif(clientCertEngine!==undefined){
 +thrownewERR_INVALID_ARG_TYPE(`${name}.clientCertEngine`,
 +['string','null','undefined'],
 +clientCertEngine);
+}
 if(ticketKeys!==undefined){