crypto: fix key handle extraction

PR-URL: #25562 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
nodejs · Jan 23, 2019 · bb7f71a · bb7f71a
1 parent 4e52b07
commit bb7f71a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -215,7 +215,7 @@ function parsePrivateKeyEncoding(enc, keyType, objName) {
 
 function getKeyObjectHandle(key, isPublic, allowKeyObject) {
   if (!allowKeyObject) {
-    return new ERR_INVALID_ARG_TYPE(
+    throw new ERR_INVALID_ARG_TYPE(
       'key',
       ['string', 'Buffer', 'TypedArray', 'DataView'],
       key

diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
@@ -58,6 +58,17 @@ const privatePem = fixtures.readSync('test_rsa_privkey.pem', 'ascii');
   assert(plaintext.equals(deciphered));
 }
 
+{
+  // Passing an existing key object should throw.
+  const publicKey = createPublicKey(publicPem);
+  common.expectsError(() => createPublicKey(publicKey), {
+    type: TypeError,
+    code: 'ERR_INVALID_ARG_TYPE',
+    message: 'The "key" argument must be one of type string, Buffer, ' +
+             'TypedArray, or DataView. Received type object'
+  });
+}
+
 {
   const publicKey = createPublicKey(publicPem);
   assert.strictEqual(publicKey.type, 'public');