crypto: fix subtle.importKey JWK OKP public key import

PR-URL: #37255 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
nodejs · Feb 9, 2021 · 51249a1 · 51249a1
1 parent 39d4d14
commit 51249a1
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -303,7 +303,7 @@ async function ecImportKey(
           keyObject = createECRawKey(
             namedCurve,
             Buffer.from(
-              isPublic ? keyData.k : keyData.d,
+              isPublic ? keyData.x : keyData.d,
               'base64'),
             isPublic);
           break;

diff --git a/test/parallel/test-webcrypto-x25519-x448.js b/test/parallel/test-webcrypto-x25519-x448.js
@@ -244,3 +244,36 @@ assert.rejects(
   {
     message: /Unsupported named curves for ECDH/
   });
+
+{
+  // Private JWK import
+  subtle.importKey(
+    'jwk',
+    {
+      crv: 'X25519',
+      d: '8CE-XY7cvbR-Pu7mILHq8YZ4hLGAA2-RD01he5q2wUA',
+      x: '42IbTo34ZYANub5o42547vB6OxdEd44ztwZewoRch0Q',
+      kty: 'OKP'
+    },
+    {
+      name: 'ECDH',
+      namedCurve: 'NODE-X25519'
+    },
+    true,
+    ['deriveBits']).then(common.mustCall());
+
+  // Public JWK import
+  subtle.importKey(
+    'jwk',
+    {
+      crv: 'X25519',
+      x: '42IbTo34ZYANub5o42547vB6OxdEd44ztwZewoRch0Q',
+      kty: 'OKP'
+    },
+    {
+      name: 'ECDH',
+      namedCurve: 'NODE-X25519'
+    },
+    true,
+    []).then(common.mustCall());
+}