crypto: handle initEDRaw pkey failure

nodejs · Sep 23, 2021 · 323cafb · 323cafb
1 parent c7da13c
commit 323cafb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -123,11 +123,15 @@ function createECRawKey(namedCurve, keyData, isPublic) {
   }
 
   if (isPublic) {
-    handle.initEDRaw(namedCurve, keyData, kKeyTypePublic);
+    if (!handle.initEDRaw(namedCurve, keyData, kKeyTypePublic)) {
+      throw lazyDOMException('Failure to generate key object');
+    }
     return new PublicKeyObject(handle);
   }
 
-  handle.initEDRaw(namedCurve, keyData, kKeyTypePrivate);
+  if (!handle.initEDRaw(namedCurve, keyData, kKeyTypePrivate)) {
+    throw lazyDOMException('Failure to generate key object');
+  }
   return new PrivateKeyObject(handle);
 }
 

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