crypto: fix subtle.importKey JWK OKP public key import

nodejs · Feb 6, 2021 · 8eb46ef · 8eb46ef
1 parent 2ff1c83
commit 8eb46ef
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());
+  }