From 9f85585b13faf9059da9760a77c3c75929da5860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sun, 29 Dec 2019 15:52:01 +0100
Subject: [PATCH] crypto: add key type 'dh'

The new key type 'dh' corresponds to EVP_PKEY_DH.

PR-URL: https://github.com/nodejs/node/pull/31178
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
---
 doc/api/crypto.md  | 4 ++++
 src/env.h          | 1 +
 src/node_crypto.cc | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index 2b1c472835ca92..14c80bf8d39448 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -1232,6 +1232,9 @@ passing keys as strings or `Buffer`s due to improved security features.
 <!-- YAML
 added: v11.6.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/31178
+    description: Added support for `'dh'`.
   - version: v12.0.0
     pr-url: https://github.com/nodejs/node/pull/26960
     description: Added support for `'rsa-pss'`
@@ -1260,6 +1263,7 @@ types are:
 * `'x448'` (OID 1.3.101.111)
 * `'ed25519'` (OID 1.3.101.112)
 * `'ed448'` (OID 1.3.101.113)
+* `'dh'` (OID 1.2.840.113549.1.3.1)
 
 This property is `undefined` for unrecognized `KeyObject` types and symmetric
 keys.
diff --git a/src/env.h b/src/env.h
index cdcb8f5cf3b923..337272be76c3ff 100644
--- a/src/env.h
+++ b/src/env.h
@@ -194,6 +194,7 @@ constexpr size_t kFsStatsBufferLength =
   V(commonjs_string, "commonjs")                                               \
   V(config_string, "config")                                                   \
   V(constants_string, "constants")                                             \
+  V(crypto_dh_string, "dh")                                                    \
   V(crypto_dsa_string, "dsa")                                                  \
   V(crypto_ec_string, "ec")                                                    \
   V(crypto_ed25519_string, "ed25519")                                          \
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 921b5a25a1024b..f9f9fa7b34d9e3 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3326,6 +3326,8 @@ Local<Value> KeyObject::GetAsymmetricKeyType() const {
     return env()->crypto_rsa_pss_string();
   case EVP_PKEY_DSA:
     return env()->crypto_dsa_string();
+  case EVP_PKEY_DH:
+    return env()->crypto_dh_string();
   case EVP_PKEY_EC:
     return env()->crypto_ec_string();
   case EVP_PKEY_ED25519: