crypto: fixup bug in keygen error handling

jasnell · danielleadams · commit 42aca1395349 · 2021-01-12T07:11:42.000-05:00
Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #36779 Refs: #36729 Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js
@@ -94,13 +94,15 @@ function generateKeyPairSync(type, options){
 }
 
 function handleError(ret){
- if (ret === undefined)
+ if (ret == null)
 return; // async
 
- const [err, [publicKey, privateKey]] = ret;
+ const [err, keys] = ret;
 if (err !== undefined)
 throw err;
 
+ const [publicKey, privateKey] = keys;
+
 // If no encoding was chosen, return key objects instead.
 return{
 publicKey: wrapKey(publicKey, PublicKeyObject),

-Original file line number
+Diff line change
+}
 functionhandleError(ret){
 -if(ret===undefined)
 +if(ret==null)
 return;// async
 -const[err,[publicKey,privateKey]]=ret;
 +const[err,keys]=ret;
 if(err!==undefined)
 throwerr;
 +const[publicKey,privateKey]=keys;
++
 // If no encoding was chosen, return key objects instead.
 return{
 publicKey: wrapKey(publicKey,PublicKeyObject),