crypto: handle initEDRaw pkey failure

PR-URL: #40188 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Oct 4, 2021 · 2fa5e50 · 2fa5e50
1 parent bddf8c2
commit 2fa5e50
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -122,13 +122,12 @@ function createECRawKey(namedCurve, keyData, isPublic) {
       break;
   }
 
-  if (isPublic) {
-    handle.initEDRaw(namedCurve, keyData, kKeyTypePublic);
-    return new PublicKeyObject(handle);
+  const keyType = isPublic ? kKeyTypePublic : kKeyTypePrivate;
+  if (!handle.initEDRaw(namedCurve, keyData, keyType)) {
+    throw lazyDOMException('Failure to generate key object');
   }
 
-  handle.initEDRaw(namedCurve, keyData, kKeyTypePrivate);
-  return new PrivateKeyObject(handle);
+  return isPublic ? new PublicKeyObject(handle) : new PrivateKeyObject(handle);
 }
 
 async function ecGenerateKey(algorithm, extractable, keyUsages) {

diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -435,16 +435,10 @@ function getKeyObjectHandleFromJwk(key, ctx) {
     }
 
     const handle = new KeyObjectHandle();
-    if (isPublic) {
-      handle.initEDRaw(
-        `NODE-${key.crv.toUpperCase()}`,
-        keyData,
-        kKeyTypePublic);
-    } else {
-      handle.initEDRaw(
-        `NODE-${key.crv.toUpperCase()}`,
-        keyData,
-        kKeyTypePrivate);
+
+    const keyType = isPublic ? kKeyTypePublic : kKeyTypePrivate;
+    if (!handle.initEDRaw(`NODE-${key.crv.toUpperCase()}`, keyData, keyType)) {
+      throw new ERR_CRYPTO_INVALID_JWK();
     }
 
     return handle;