losing my mind

nodejs · Mar 21, 2021 · 145ce72 · 145ce72
1 parent ed06738
commit 145ce72
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
@@ -39,6 +39,10 @@ const {
 } = require('internal/crypto/util');
 
 const {
+  createPrivateKey,
+  createPublicKey,
+  isCryptoKey,
+  isKeyObject,
   preparePrivateKey,
   preparePublicOrPrivateKey,
 } = require('internal/crypto/keys');
@@ -157,20 +161,22 @@ function signOneShot(algorithm, data, key, callback) {
   // Options specific to (EC)DSA
   const dsaSigEnc = getDSASignatureEncoding(key);
 
-  const {
-    data: keyData,
-    format: keyFormat,
-    type: keyType,
-    passphrase: keyPassphrase
-  } = preparePrivateKey(key);
+  let keyData;
+  if (isKeyObject(key) || isCryptoKey(key)) {
+    ({ data: keyData } = preparePrivateKey(key));
+  } else if (key != null && (isKeyObject(key.key) || isCryptoKey(key.key))) {
+    ({ data: keyData } = preparePrivateKey(key.key));
+  } else {
+    keyData = createPrivateKey(key)[kHandle];
+  }
 
   const job = new SignJob(
     callback ? kCryptoJobAsync : kCryptoJobSync,
     kSignJobModeSign,
     keyData,
-    keyFormat,
-    keyType,
-    keyPassphrase,
+    undefined,
+    undefined,
+    undefined,
     data,
     algorithm,
     pssSaltLength,
@@ -263,20 +269,22 @@ function verifyOneShot(algorithm, data, key, signature, callback) {
     );
   }
 
-  const {
-    data: keyData,
-    format: keyFormat,
-    type: keyType,
-    passphrase: keyPassphrase
-  } = preparePublicOrPrivateKey(key);
+  let keyData;
+  if (isKeyObject(key) || isCryptoKey(key)) {
+    ({ data: keyData } = preparePublicOrPrivateKey(key));
+  } else if (key != null && (isKeyObject(key.key) || isCryptoKey(key.key))) {
+    ({ data: keyData } = preparePublicOrPrivateKey(key.key));
+  } else {
+    keyData = createPublicKey(key)[kHandle];
+  }
 
   const job = new SignJob(
     callback ? kCryptoJobAsync : kCryptoJobSync,
     kSignJobModeVerify,
     keyData,
-    keyFormat,
-    keyType,
-    keyPassphrase,
+    undefined,
+    undefined,
+    undefined,
     data,
     algorithm,
     pssSaltLength,