crypto: fix key handle extraction

tniessen · BridgeAR · commit 9315daaf02bb · 2019-01-18T14:55:29.000+01:00
PR-URL: nodejs#25562 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
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');
