Commit fd6ba3f246e for nodejs
commit fd6ba3f246ef7c483eeab96ee6af1cbe0199f97c
Author: James M Snell <jasnell@gmail.com>
Date: Sun Nov 15 17:20:38 2026 +0000
crypto: share asymmetric WebCrypto key import logic
The RSA, EC, CFRG, ML-DSA, and ML-KEM importKey implementations each
duplicated the handling of the 'KeyObjectHandle', 'spki', and 'pkcs8'
formats. Move it into a shared importAsymmetricKeyHandle() helper in
webcrypto_util, with an optional hook that ML-DSA and ML-KEM use to
reject PKCS#8 keys without a seed.
Assisted-by: Claude
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/67495
Reviewed-By: Guilherme Araújo <arauujogui@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
index 2e4bf9a8275..c797c433558 100644
--- a/lib/internal/crypto/cfrg.js
+++ b/lib/internal/crypto/cfrg.js
@@ -10,7 +10,6 @@ const {
kCryptoJobWebCrypto,
kKeyFormatDER,
kKeyFormatRawPublic,
- kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kWebCryptoKeyFormatPKCS8,
@@ -39,7 +38,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
- importDerKey,
+ importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
@@ -117,24 +116,11 @@ function cfrgImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
- verifyAcceptableKeyUse(
- name,
- usagesSet,
- keyData.getKeyType() === kKeyTypePublic ?
- allowedUsages.public :
- allowedUsages.private);
- handle = keyData;
- break;
- case 'spki': {
- verifyAcceptableKeyUse(name, usagesSet, allowedUsages.public);
- handle = importDerKey(keyData, true);
- break;
- }
- case 'pkcs8': {
- verifyAcceptableKeyUse(name, usagesSet, allowedUsages.private);
- handle = importDerKey(keyData, false);
+ case 'spki':
+ case 'pkcs8':
+ handle = importAsymmetricKeyHandle(
+ format, keyData, name, usagesSet, allowedUsages);
break;
- }
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
index bb857be74c8..7aedff11559 100644
--- a/lib/internal/crypto/ec.js
+++ b/lib/internal/crypto/ec.js
@@ -50,7 +50,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
- importDerKey,
+ importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
@@ -148,24 +148,11 @@ function ecImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
- verifyAcceptableKeyUse(
- name,
- usagesSet,
- keyData.getKeyType() === kKeyTypePublic ?
- allowedUsages.public :
- allowedUsages.private);
- handle = keyData;
- break;
- case 'spki': {
- verifyAcceptableKeyUse(name, usagesSet, allowedUsages.public);
- handle = importDerKey(keyData, true);
- break;
- }
- case 'pkcs8': {
- verifyAcceptableKeyUse(name, usagesSet, allowedUsages.private);
- handle = importDerKey(keyData, false);
+ case 'spki':
+ case 'pkcs8':
+ handle = importAsymmetricKeyHandle(
+ format, keyData, name, usagesSet, allowedUsages);
break;
- }
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
diff --git a/lib/internal/crypto/ml_dsa.js b/lib/internal/crypto/ml_dsa.js
index 581e9beb5d0..38850d4a21e 100644
--- a/lib/internal/crypto/ml_dsa.js
+++ b/lib/internal/crypto/ml_dsa.js
@@ -12,7 +12,6 @@ const {
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyFormatRawSeed,
- kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kWebCryptoKeyFormatRaw,
@@ -42,7 +41,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
- importDerKey,
+ importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
@@ -105,6 +104,21 @@ function mlDsaExportKey(key, format) {
}
}
+const kPrivOnlyPkcs8Lengths = {
+ '__proto__': null,
+ 'ML-DSA-44': 2588,
+ 'ML-DSA-65': 4060,
+ 'ML-DSA-87': 4924,
+};
+
+function rejectPkcs8WithoutSeed(keyData, name) {
+ if (getBufferSourceByteLength(keyData) === kPrivOnlyPkcs8Lengths[name]) {
+ throw lazyDOMException(
+ 'Importing an ML-DSA PKCS#8 key without a seed is not supported',
+ 'NotSupportedError');
+ }
+}
+
function mlDsaImportKey(
format,
keyData,
@@ -117,37 +131,12 @@ function mlDsaImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
- verifyAcceptableKeyUse(
- name,
- usagesSet,
- keyData.getKeyType() === kKeyTypePublic ?
- kUsages.public :
- kUsages.private);
- handle = keyData;
- break;
- case 'spki': {
- verifyAcceptableKeyUse(name, usagesSet, kUsages.public);
- handle = importDerKey(keyData, true);
- break;
- }
- case 'pkcs8': {
- verifyAcceptableKeyUse(name, usagesSet, kUsages.private);
-
- const privOnlyLengths = {
- '__proto__': null,
- 'ML-DSA-44': 2588,
- 'ML-DSA-65': 4060,
- 'ML-DSA-87': 4924,
- };
- if (getBufferSourceByteLength(keyData) === privOnlyLengths[name]) {
- throw lazyDOMException(
- 'Importing an ML-DSA PKCS#8 key without a seed is not supported',
- 'NotSupportedError');
- }
-
- handle = importDerKey(keyData, false);
+ case 'spki':
+ case 'pkcs8':
+ handle = importAsymmetricKeyHandle(
+ format, keyData, name, usagesSet, kUsages,
+ (data) => rejectPkcs8WithoutSeed(data, name));
break;
- }
case 'jwk': {
const isPublic = keyData.priv === undefined;
verifyAcceptableKeyUse(
diff --git a/lib/internal/crypto/ml_kem.js b/lib/internal/crypto/ml_kem.js
index 025790829f0..e0987b60f51 100644
--- a/lib/internal/crypto/ml_kem.js
+++ b/lib/internal/crypto/ml_kem.js
@@ -13,7 +13,6 @@ const {
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyFormatRawSeed,
- kKeyTypePublic,
kWebCryptoKeyFormatPKCS8,
kWebCryptoKeyFormatRaw,
kWebCryptoKeyFormatSPKI,
@@ -40,7 +39,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
- importDerKey,
+ importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
@@ -105,6 +104,21 @@ function mlKemExportKey(key, format) {
}
}
+const kPrivOnlyPkcs8Lengths = {
+ '__proto__': null,
+ 'ML-KEM-512': 1660,
+ 'ML-KEM-768': 2428,
+ 'ML-KEM-1024': 3196,
+};
+
+function rejectPkcs8WithoutSeed(keyData, name) {
+ if (getBufferSourceByteLength(keyData) === kPrivOnlyPkcs8Lengths[name]) {
+ throw lazyDOMException(
+ 'Importing an ML-KEM PKCS#8 key without a seed is not supported',
+ 'NotSupportedError');
+ }
+}
+
function mlKemImportKey(
format,
keyData,
@@ -117,37 +131,12 @@ function mlKemImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
- verifyAcceptableKeyUse(
- name,
- usagesSet,
- keyData.getKeyType() === kKeyTypePublic ?
- kUsages.public :
- kUsages.private);
- handle = keyData;
- break;
- case 'spki': {
- verifyAcceptableKeyUse(name, usagesSet, kUsages.public);
- handle = importDerKey(keyData, true);
- break;
- }
- case 'pkcs8': {
- verifyAcceptableKeyUse(name, usagesSet, kUsages.private);
-
- const privOnlyLengths = {
- '__proto__': null,
- 'ML-KEM-512': 1660,
- 'ML-KEM-768': 2428,
- 'ML-KEM-1024': 3196,
- };
- if (getBufferSourceByteLength(keyData) === privOnlyLengths[name]) {
- throw lazyDOMException(
- 'Importing an ML-KEM PKCS#8 key without a seed is not supported',
- 'NotSupportedError');
- }
-
- handle = importDerKey(keyData, false);
+ case 'spki':
+ case 'pkcs8':
+ handle = importAsymmetricKeyHandle(
+ format, keyData, name, usagesSet, kUsages,
+ (data) => rejectPkcs8WithoutSeed(data, name));
break;
- }
case 'raw-public':
case 'raw-seed': {
const isPublic = format === 'raw-public';
diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js
index 8fa3ecdff1b..9dd90803a05 100644
--- a/lib/internal/crypto/rsa.js
+++ b/lib/internal/crypto/rsa.js
@@ -12,7 +12,6 @@ const {
SignJob,
kCryptoJobWebCrypto,
kKeyFormatDER,
- kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kKeyVariantRSA_OAEP,
@@ -53,7 +52,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
- importDerKey,
+ importAsymmetricKeyHandle,
importJwkKey,
validateJwk,
validateKeyUsages,
@@ -182,26 +181,11 @@ function rsaImportKey(
let handle;
switch (format) {
case 'KeyObjectHandle':
- verifyAcceptableKeyUse(
- algorithm.name,
- usagesSet,
- keyData.getKeyType() === kKeyTypePublic ?
- allowedUsages.public :
- allowedUsages.private);
- handle = keyData;
- break;
- case 'spki': {
- verifyAcceptableKeyUse(
- algorithm.name, usagesSet, allowedUsages.public);
- handle = importDerKey(keyData, true);
+ case 'spki':
+ case 'pkcs8':
+ handle = importAsymmetricKeyHandle(
+ format, keyData, algorithm.name, usagesSet, allowedUsages);
break;
- }
- case 'pkcs8': {
- verifyAcceptableKeyUse(
- algorithm.name, usagesSet, allowedUsages.private);
- handle = importDerKey(keyData, false);
- break;
- }
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
diff --git a/lib/internal/crypto/webcrypto_util.js b/lib/internal/crypto/webcrypto_util.js
index 065520c59cb..2b21d455cc5 100644
--- a/lib/internal/crypto/webcrypto_util.js
+++ b/lib/internal/crypto/webcrypto_util.js
@@ -139,6 +139,39 @@ function importDerKey(keyData, isPublic) {
return handle;
}
+/**
+ * Imports a key in one of the formats shared by the asymmetric WebCrypto
+ * algorithms: 'KeyObjectHandle', 'spki', or 'pkcs8'.
+ * @param {string} format
+ * @param {any} keyData
+ * @param {string} name The algorithm name.
+ * @param {Set<string>} usagesSet
+ * @param {{ public: string[], private: string[] }} allowedUsages
+ * @param {(keyData: any) => void} [validatePkcs8] Additional validation run
+ * for 'pkcs8' key data after the key usages have been verified.
+ * @returns {KeyObjectHandle}
+ */
+function importAsymmetricKeyHandle(
+ format, keyData, name, usagesSet, allowedUsages, validatePkcs8) {
+ switch (format) {
+ case 'KeyObjectHandle':
+ verifyAcceptableKeyUse(
+ name,
+ usagesSet,
+ keyData.getKeyType() === kKeyTypePublic ?
+ allowedUsages.public :
+ allowedUsages.private);
+ return keyData;
+ case 'spki':
+ verifyAcceptableKeyUse(name, usagesSet, allowedUsages.public);
+ return importDerKey(keyData, true);
+ case 'pkcs8':
+ verifyAcceptableKeyUse(name, usagesSet, allowedUsages.private);
+ validatePkcs8?.(keyData);
+ return importDerKey(keyData, false);
+ }
+}
+
function validateJwk(keyData, kty, extractable, usagesSet, expectedUse) {
if (typeof keyData.kty !== 'string')
throw lazyDOMException('Invalid keyData', 'DataError');
@@ -246,6 +279,7 @@ function importJwkSecretKey(keyData) {
module.exports = {
createKeyUsages,
getKeyPairUsages,
+ importAsymmetricKeyHandle,
importDerKey,
importJwkKey,
importJwkSecretKey,