From 247c14c040026252814c3d4e8cffb8ac8748180e Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Tue, 26 Feb 2019 05:24:38 -0500
Subject: [PATCH] crypto: fix EdDSA support for KeyObject
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/26319
Fixes: https://github.com/nodejs/node/issues/26316
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
---
 doc/api/crypto.md                        |  7 +++++-
 src/env.h                                |  2 ++
 src/node_crypto.cc                       |  4 +++
 test/fixtures/test_ed25519_privkey.pem   |  3 +++
 test/fixtures/test_ed25519_pubkey.pem    |  3 +++
 test/fixtures/test_ed448_privkey.pem     |  4 +++
 test/fixtures/test_ed448_pubkey.pem      |  4 +++
 test/parallel/test-crypto-key-objects.js | 31 ++++++++++++++++++++++++
 8 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/test_ed25519_privkey.pem
 create mode 100644 test/fixtures/test_ed25519_pubkey.pem
 create mode 100644 test/fixtures/test_ed448_privkey.pem
 create mode 100644 test/fixtures/test_ed448_pubkey.pem

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
index f10764c9e4b9b2..cc310f67d1187c 100644
--- a/doc/api/crypto.md
+++ b/doc/api/crypto.md
@@ -1133,11 +1133,16 @@ bytes. This property is `undefined` for symmetric keys.
 ### keyObject.asymmetricKeyType
 <!-- YAML
 added: v11.6.0
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/26319
+    description: Added support for `'ed25519'` and `'ed448'`
 -->
 * {string}
 
 For asymmetric keys, this property represents the type of the embedded key
-(`'rsa'`, `'dsa'` or `'ec'`). This property is `undefined` for symmetric keys.
+(`'rsa'`, `'dsa'`, `'ec'`, `'ed25519'`, or `'ed448'`).
+This property is `undefined` for symmetric keys.
 
 ### keyObject.export([options])
 <!-- YAML
diff --git a/src/env.h b/src/env.h
index 62ce57b0bc37ed..15ca78b74bc967 100644
--- a/src/env.h
+++ b/src/env.h
@@ -144,6 +144,8 @@ constexpr size_t kFsStatsBufferLength = kFsStatsFieldsNumber * 2;
   V(constants_string, "constants")                                             \
   V(crypto_dsa_string, "dsa")                                                  \
   V(crypto_ec_string, "ec")                                                    \
+  V(crypto_ed25519_string, "ed25519")                                          \
+  V(crypto_ed448_string, "ed448")                                              \
   V(crypto_rsa_string, "rsa")                                                  \
   V(cwd_string, "cwd")                                                         \
   V(data_string, "data")                                                       \
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index bf985694f510b3..57c738e225b113 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -3468,6 +3468,10 @@ Local<String> KeyObject::GetAsymmetricKeyType() const {
     return env()->crypto_dsa_string();
   case EVP_PKEY_EC:
     return env()->crypto_ec_string();
+  case EVP_PKEY_ED25519:
+    return env()->crypto_ed25519_string();
+  case EVP_PKEY_ED448:
+    return env()->crypto_ed448_string();
   default:
     CHECK(false);
   }
diff --git a/test/fixtures/test_ed25519_privkey.pem b/test/fixtures/test_ed25519_privkey.pem
new file mode 100644
index 00000000000000..a8b9f2f603f03a
--- /dev/null
+++ b/test/fixtures/test_ed25519_privkey.pem
@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIHXLsXm1lsq5HtyqJwQyFmpfEluuf0KOqP6DqMgGxxDL
+-----END PRIVATE KEY-----
diff --git a/test/fixtures/test_ed25519_pubkey.pem b/test/fixtures/test_ed25519_pubkey.pem
new file mode 100644
index 00000000000000..b9657c9d08d050
--- /dev/null
+++ b/test/fixtures/test_ed25519_pubkey.pem
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MCowBQYDK2VwAyEAEXRYV3v5ucrHVR3mKqyPXxXqU34lASwc7Y7MoOvaqcs=
+-----END PUBLIC KEY-----
diff --git a/test/fixtures/test_ed448_privkey.pem b/test/fixtures/test_ed448_privkey.pem
new file mode 100644
index 00000000000000..b430a7ee7ca56b
--- /dev/null
+++ b/test/fixtures/test_ed448_privkey.pem
@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MEcCAQAwBQYDK2VxBDsEObxytD95dGN3Hxk7kVk+Lig1rGYTRr3YdaHjRog++Sgk
+QD7KwKmxroBURtkE2N0JbQ3ctdrpGRB5DQ==
+-----END PRIVATE KEY-----
diff --git a/test/fixtures/test_ed448_pubkey.pem b/test/fixtures/test_ed448_pubkey.pem
new file mode 100644
index 00000000000000..5619b93aeb0310
--- /dev/null
+++ b/test/fixtures/test_ed448_pubkey.pem
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MEMwBQYDK2VxAzoAIESY3jnpGdB5UVJDCznrv0vmBFIzgSMu+gafsbCX1rFtsJwR
+M6XUDQiEY7dk6rmm/Fktyawna5EA
+-----END PUBLIC KEY-----
diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
index 85157439920e66..c324dea8f991a3 100644
--- a/test/parallel/test-crypto-key-objects.js
+++ b/test/parallel/test-crypto-key-objects.js
@@ -170,3 +170,34 @@ const privatePem = fixtures.readSync('test_rsa_privkey.pem', 'ascii');
     createPrivateKey({ key: '' });
   }, /null/);
 }
+
+[
+  { private: fixtures.readSync('test_ed25519_privkey.pem', 'ascii'),
+    public: fixtures.readSync('test_ed25519_pubkey.pem', 'ascii'),
+    keyType: 'ed25519' },
+  { private: fixtures.readSync('test_ed448_privkey.pem', 'ascii'),
+    public: fixtures.readSync('test_ed448_pubkey.pem', 'ascii'),
+    keyType: 'ed448' }
+].forEach((info) => {
+  const keyType = info.keyType;
+
+  {
+    const exportOptions = { type: 'pkcs8', format: 'pem' };
+    const key = createPrivateKey(info.private);
+    assert.strictEqual(key.type, 'private');
+    assert.strictEqual(key.asymmetricKeyType, keyType);
+    assert.strictEqual(key.symmetricKeySize, undefined);
+    assert.strictEqual(key.export(exportOptions), info.private);
+  }
+
+  {
+    const exportOptions = { type: 'spki', format: 'pem' };
+    [info.private, info.public].forEach((pem) => {
+      const key = createPublicKey(pem);
+      assert.strictEqual(key.type, 'public');
+      assert.strictEqual(key.asymmetricKeyType, keyType);
+      assert.strictEqual(key.symmetricKeySize, undefined);
+      assert.strictEqual(key.export(exportOptions), info.public);
+    });
+  }
+});