Commit c8073803481 for nodejs
commit c807380348148fd718cfa94b6f12efd033ede1ac
Author: James M Snell <jasnell@gmail.com>
Date: Sun Nov 15 17:29:39 2026 +0000
crypto: deduplicate WebCrypto SPKI/PKCS#8 exporter lookup
exportKeySpki() and exportKeyPkcs8() contained identical switch
statements mapping the algorithm name to its export function. Move
the lookup into a shared getAsymmetricKeyExporter() helper.
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/webcrypto.js b/lib/internal/crypto/webcrypto.js
index 7ca945cb4f2..3ecb96f0dfc 100644
--- a/lib/internal/crypto/webcrypto.js
+++ b/lib/internal/crypto/webcrypto.js
@@ -499,21 +499,20 @@ function deriveKeyImpl(
));
}
-function exportKeySpki(key) {
- let exporter;
- switch (getCryptoKeyAlgorithm(key).name) {
+// Returns the SPKI/PKCS#8 export function for an asymmetric algorithm, or
+// undefined if the algorithm does not support those formats.
+function getAsymmetricKeyExporter(name) {
+ switch (name) {
case 'RSASSA-PKCS1-v1_5':
// Fall through
case 'RSA-PSS':
// Fall through
case 'RSA-OAEP':
- exporter = require('internal/crypto/rsa').rsaExportKey;
- break;
+ return require('internal/crypto/rsa').rsaExportKey;
case 'ECDSA':
// Fall through
case 'ECDH':
- exporter = require('internal/crypto/ec').ecExportKey;
- break;
+ return require('internal/crypto/ec').ecExportKey;
case 'Ed25519':
// Fall through
case 'Ed448':
@@ -521,25 +520,28 @@ function exportKeySpki(key) {
case 'X25519':
// Fall through
case 'X448':
- exporter = require('internal/crypto/cfrg').cfrgExportKey;
- break;
+ return require('internal/crypto/cfrg').cfrgExportKey;
case 'ML-DSA-44':
// Fall through
case 'ML-DSA-65':
// Fall through
case 'ML-DSA-87':
- exporter = require('internal/crypto/ml_dsa').mlDsaExportKey;
- break;
+ return require('internal/crypto/ml_dsa').mlDsaExportKey;
case 'ML-KEM-512':
// Fall through
case 'ML-KEM-768':
// Fall through
case 'ML-KEM-1024':
- exporter = require('internal/crypto/ml_kem').mlKemExportKey;
- break;
+ return require('internal/crypto/ml_kem').mlKemExportKey;
default:
return undefined;
}
+}
+
+function exportKeySpki(key) {
+ const exporter = getAsymmetricKeyExporter(getCryptoKeyAlgorithm(key).name);
+ if (exporter === undefined)
+ return undefined;
if (getCryptoKeyType(key) !== 'public')
throw lazyDOMException('Key must be a public key', 'InvalidAccessError');
@@ -548,46 +550,9 @@ function exportKeySpki(key) {
}
function exportKeyPkcs8(key) {
- let exporter;
- switch (getCryptoKeyAlgorithm(key).name) {
- case 'RSASSA-PKCS1-v1_5':
- // Fall through
- case 'RSA-PSS':
- // Fall through
- case 'RSA-OAEP':
- exporter = require('internal/crypto/rsa').rsaExportKey;
- break;
- case 'ECDSA':
- // Fall through
- case 'ECDH':
- exporter = require('internal/crypto/ec').ecExportKey;
- break;
- case 'Ed25519':
- // Fall through
- case 'Ed448':
- // Fall through
- case 'X25519':
- // Fall through
- case 'X448':
- exporter = require('internal/crypto/cfrg').cfrgExportKey;
- break;
- case 'ML-DSA-44':
- // Fall through
- case 'ML-DSA-65':
- // Fall through
- case 'ML-DSA-87':
- exporter = require('internal/crypto/ml_dsa').mlDsaExportKey;
- break;
- case 'ML-KEM-512':
- // Fall through
- case 'ML-KEM-768':
- // Fall through
- case 'ML-KEM-1024':
- exporter = require('internal/crypto/ml_kem').mlKemExportKey;
- break;
- default:
- return undefined;
- }
+ const exporter = getAsymmetricKeyExporter(getCryptoKeyAlgorithm(key).name);
+ if (exporter === undefined)
+ return undefined;
if (getCryptoKeyType(key) !== 'private')
throw lazyDOMException('Key must be a private key', 'InvalidAccessError');