From 6689679842e4044d141fbc8f20d2af702912a9f5 Mon Sep 17 00:00:00 2001
From: Filip Skokan <panva.ip@gmail.com>
Date: Tue, 19 Feb 2019 11:05:55 +0100
Subject: [PATCH 1/2] crypto: expose isKeyObject helper

---
 doc/api/crypto.md            | 20 ++++++++++++++++++++
 lib/crypto.js                |  2 ++
 lib/internal/crypto/keys.js  |  4 ++--
 test/parallel/test-crypto.js |  9 +++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 72d4bc78df9dde..e6f4370e86ddaf 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -1121,6 +1121,9 @@ exposes different functions.
 Most applications should consider using the new `KeyObject` API instead of
 passing keys as strings or `Buffer`s due to improved security features.
 
+See [`crypto.isKeyObject()`][] for checking whether a given input is
+a `KeyObject` instance.
+
 ### keyObject.asymmetricKeyType
 <!-- YAML
 added: v11.6.0
@@ -2070,6 +2073,23 @@ const hashes = crypto.getHashes();
 console.log(hashes); // ['DSA', 'DSA-SHA', 'DSA-SHA1', ...]
 ```
 
+### crypto.isKeyObject(value)
+<!-- YAML
+added: REPLACEME
+-->
+
+* `value` {any}
+* Returns: {boolean}
+
+Returns `true` if the value is a [`KeyObject`] instance.
+
+```js
+const crypto = require('crypto');
+const keypair = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
+
+crypto.isKeyObject(keypair.privateKey);  // Returns true
+```
+
 ### crypto.pbkdf2(password, salt, iterations, keylen, digest, callback)
 <!-- YAML
 added: v0.5.5
diff --git a/lib/crypto.js b/lib/crypto.js
index 97a9b14bc8afd6..f59a2bd122aeb7 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -60,6 +60,7 @@ const {
   generateKeyPairSync
 } = require('internal/crypto/keygen');
 const {
+  isKeyObject,
   createSecretKey,
   createPublicKey,
   createPrivateKey
@@ -164,6 +165,7 @@ module.exports = exports = {
   getHashes,
   pbkdf2,
   pbkdf2Sync,
+  isKeyObject,
   generateKeyPair,
   generateKeyPairSync,
   privateDecrypt,
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
index ecd747d947516f..85a7a495630c2d 100644
--- a/lib/internal/crypto/keys.js
+++ b/lib/internal/crypto/keys.js
@@ -318,6 +318,7 @@ module.exports = {
   createSecretKey,
   createPublicKey,
   createPrivateKey,
+  isKeyObject,
 
   // These are designed for internal use only and should not be exposed.
   parsePublicKeyEncoding,
@@ -327,6 +328,5 @@ module.exports = {
   prepareSecretKey,
   SecretKeyObject,
   PublicKeyObject,
-  PrivateKeyObject,
-  isKeyObject
+  PrivateKeyObject
 };
diff --git a/test/parallel/test-crypto.js b/test/parallel/test-crypto.js
index 73b81ec1b10149..3a4c7e88474139 100644
--- a/test/parallel/test-crypto.js
+++ b/test/parallel/test-crypto.js
@@ -300,3 +300,12 @@ testEncoding({
 testEncoding({
   defaultEncoding: 'latin1'
 }, assertionHashLatin1);
+
+// isKeyObject checks
+assert(crypto.isKeyObject(crypto.createSecretKey(Buffer.from('foo'))));
+const keypair = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
+assert(crypto.isKeyObject(keypair.privateKey));
+assert(crypto.isKeyObject(keypair.publicKey));
+[null, undefined, false, 5, 'foo', {}, Buffer].forEach((value) => {
+  assert(!crypto.isKeyObject(value));
+});

From 830420a86b8e943fbb98bfc6b2968c1ebd05a3a9 Mon Sep 17 00:00:00 2001
From: Filip Skokan <panva.ip@gmail.com>
Date: Thu, 21 Feb 2019 14:54:25 +0100
Subject: [PATCH 2/2] fix: crypto.md []

---
 doc/api/crypto.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index e6f4370e86ddaf..1021e2c653f883 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -1913,7 +1913,7 @@ are currently supported.
 
 If a `publicKeyEncoding` or `privateKeyEncoding` was specified, this function
 behaves as if [`keyObject.export()`][] had been called on its result. Otherwise,
-the respective part of the key is returned as a [`KeyObject`].
+the respective part of the key is returned as a [`KeyObject`][].
 
 It is recommended to encode public keys as `'spki'` and private keys as
 `'pkcs8'` with encryption for long-term storage:
@@ -1969,7 +1969,7 @@ are currently supported.
 
 If a `publicKeyEncoding` or `privateKeyEncoding` was specified, this function
 behaves as if [`keyObject.export()`][] had been called on its result. Otherwise,
-the respective part of the key is returned as a [`KeyObject`].
+the respective part of the key is returned as a [`KeyObject`][].
 
 When encoding public keys, it is recommended to use `'spki'`. When encoding
 private keys, it is recommended to use `'pks8'` with a strong passphrase, and to
@@ -2081,7 +2081,7 @@ added: REPLACEME
 * `value` {any}
 * Returns: {boolean}
 
-Returns `true` if the value is a [`KeyObject`] instance.
+Returns `true` if the value is a [`KeyObject`][] instance.
 
 ```js
 const crypto = require('crypto');