fixup!: passing format 'jwk'

nodejs · Jul 19, 2021 · a5672f1 · a5672f1
1 parent 5d0b081
commit a5672f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -308,12 +308,14 @@ function parseKeyFormatAndType(enc, keyType, isPublic, objName) {
                                 isInput ? kKeyFormatPEM : undefined,
                                 option('format', objName));
 
+  const isRequired = (!isInput ||
+                      format === kKeyFormatDER) &&
+                      format !== kKeyFormatJWK;
   const type = parseKeyType(typeStr,
-                            !isInput || format === kKeyFormatDER,
+                            isRequired,
                             keyType,
                             isPublic,
                             option('type', objName));
-
   return { format, type };
 }
 

diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
@@ -61,7 +61,10 @@ void GetKeyFormatAndTypeFromJs(
       config->type_ = Just<PKEncodingType>(static_cast<PKEncodingType>(
           args[*offset + 1].As<Int32>()->Value()));
     } else {
-      CHECK(context == kKeyContextInput && config->format_ == kKeyFormatPEM);
+      CHECK(
+          (context == kKeyContextInput && config->format_ == kKeyFormatPEM) ||
+            (context == kKeyContextGenerate && config->format_ == kKeyFormatJWK)
+          );
       CHECK(args[*offset + 1]->IsNullOrUndefined());
       config->type_ = Nothing<PKEncodingType>();
     }