crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 3 commits into from
Aug 13, 2026
Merged

crypto: improve SubtleCrypto.supports() accuracy #65222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2916d54
crypto: improve SubtleCrypto.supports() accuracy
panva Aug 11, 2026
6a1ac54
fixup! crypto: improve SubtleCrypto.supports() accuracy
panva Aug 11, 2026
51bf88d
fixup! crypto: improve SubtleCrypto.supports() accuracy
panva Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/internal/crypto/hkdf.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
getDigestSizeInBytes,
jobPromise,
normalizeHashName,
toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
if (length === null)
throw lazyDOMException('length cannot be null', 'OperationError');
if (length % 8) {
throw lazyDOMException(
'length must be a multiple of 8',
'OperationError');
}
if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
throw lazyDOMException(
'length exceeds the maximum derived bit length',
'OperationError');
}
}

function hkdfDeriveBits(algorithm, baseKey, length) {
validateHkdfDeriveBitsLength(length);
const { hash, salt, info } = algorithm;
validateHkdfDeriveBitsLength(length, hash);

if (length === 0)
return PromiseResolve(new ArrayBuffer(0));
Expand Down
13 changes: 1 addition & 12 deletions lib/internal/crypto/rsa.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
extractable,
usages,
) {
const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
if (publicExponentConverted === undefined) {
throw lazyDOMException(
'The publicExponent must be equivalent to an unsigned 32-bit value',
'OperationError');
}
const {
name,
modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

const allowedUsages = kUsages[name];
const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

const keyAlgorithm = {
name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
hash,
};

if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
throw lazyDOMException(
'The operation failed for an operation-specific reason',
'OperationError');
}

const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
validateUsagesNotEmpty(keyUsages.private);

Expand Down
12 changes: 9 additions & 3 deletions lib/internal/crypto/util.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
'importKey': null,
'encapsulate': null,
'decapsulate': null,
'get shared key length': null,
},
'ML-KEM-768': {
'generateKey': null,
'exportKey': null,
'importKey': null,
'encapsulate': null,
'decapsulate': null,
'get shared key length': null,
},
'ML-KEM-1024': {
'generateKey': null,
'exportKey': null,
'importKey': null,
'encapsulate': null,
'decapsulate': null,
'get shared key length': null,
},
'PBKDF2': {
'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
let result = 0;
const length = TypedArrayPrototypeGetLength(input);

for (let n = 0; n < length; ++n) {
const n_reversed = length - n - 1;
if (n_reversed >= 4 && input[n])
return; // Too large
if (n_reversed >= 4 && input[n]) {
throw lazyDOMException(
'algorithm.publicExponent must fit in an unsigned 32-bit integer',
'OperationError');
}
result |= input[n] << 8 * n_reversed;
}

Expand Down
85 changes: 58 additions & 27 deletions lib/internal/crypto/webcrypto.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
}
}

function getSharedKeyLength({ name }) {
switch (name) {
case 'ML-KEM-512':
// Fall through
case 'ML-KEM-768':
// Fall through
case 'ML-KEM-1024':
return 256;
/* c8 ignore start */
default: {
const assert = require('internal/assert');
assert.fail('Unreachable code');
}
/* c8 ignore stop */
}
}

function canImportRawSecret(algorithm, sharedKeyLength) {
switch (algorithm.name) {
case 'AES-OCB':
case 'AES-KW':
case 'AES-GCM':
case 'AES-CTR':
case 'AES-CBC':
return sharedKeyLength === 128 ||
sharedKeyLength === 192 ||
sharedKeyLength === 256;
case 'ChaCha20-Poly1305':
return sharedKeyLength === 256;
case 'HKDF':
case 'PBKDF2':
case 'Argon2i':
case 'Argon2d':
case 'Argon2id':
return true;
case 'HMAC':
if (sharedKeyLength === 0)
return false;
// Fall through
case 'KMAC128':
case 'KMAC256':
return algorithm.length === undefined ||
numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
default:
return false;
}
}

function deriveKey(
algorithm,
baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
},
);

let sharedKeyLength;
let normalizedAdditionalAlgorithm;
try {
const normalizedAlgorithm =
normalizeAlgorithm(algorithm, 'get shared key length');
sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
} catch {
return false;
}

switch (normalizedAdditionalAlgorithm.name) {
case 'AES-OCB':
case 'AES-KW':
case 'AES-GCM':
case 'AES-CTR':
case 'AES-CBC':
case 'ChaCha20-Poly1305':
case 'HKDF':
case 'PBKDF2':
case 'Argon2i':
case 'Argon2d':
case 'Argon2id':
break;
case 'HMAC':
case 'KMAC128':
case 'KMAC256':
if (normalizedAdditionalAlgorithm.length === undefined ||
numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
break;
}
return false;
default:
return false;
}
if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
return false;
}

try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
}

switch (op) {
case 'decapsulate':
case 'decrypt':
case 'digest': {
if ((normalizedAlgorithm.name === 'cSHAKE128' ||
normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
}
return true;
}
case 'decapsulate':
case 'decrypt':
case 'encapsulate':
case 'encrypt':
case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
return true;
case 'deriveBits': {
if (normalizedAlgorithm.name === 'HKDF') {
require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
require('internal/crypto/hkdf')
.validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
}

if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down
40 changes: 36 additions & 4 deletions lib/internal/crypto/webidl.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
getCryptoKeyType,
} = require('internal/crypto/keys');
const {
bigIntArrayToUnsignedInt,
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
if (getBufferSourceByteLength(buf) !== target) {
throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
key: 'modulusLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (modulusLength) => {
if (modulusLength < kRsaKeyGenMinimumModulusLength) {
throw lazyDOMException(
`algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
'OperationError');
}
},
required: true,
},
{
key: 'publicExponent',
converter: converters.BigInteger,
validator: (publicExponent) => {
const converted = bigIntArrayToUnsignedInt(publicExponent);

if (converted < 3) {
throw lazyDOMException(
'algorithm.publicExponent must be at least 3',
'OperationError');
}

if (converted % 2 === 0) {
throw lazyDOMException(
'algorithm.publicExponent must be odd',
'OperationError');
}
},
required: true,
},
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
key: 'context',
converter: converters.BufferSource,
validator(V, dict) {
const validateLength = (V) =>
validateMaxBufferLength(V, 'ContextParams.context', 255);

if (process.features.openssl_is_boringssl) {
this.validator = undefined;
this.validator = validateLength;
} else {
let { 0: major, 1: minor } =
StringPrototypeSplit(process.versions.openssl, '.');
major = NumberParseInt(major, 10);
minor = NumberParseInt(minor, 10);
if (major > 3 || (major === 3 && minor >= 2)) {
this.validator = undefined;
this.validator = validateLength;
} else {
this.validator = validateZeroLength('ContextParams.context');
this.validator(V, dict);
const validateEmpty = validateZeroLength('ContextParams.context');
this.validator = (V, dict) => {
validateLength(V);
validateEmpty(V, dict);
};
}
}
this.validator(V, dict);
},
},
],
Expand Down
32 changes: 32 additions & 0 deletions test/fixtures/webcrypto/supports-level-2.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
[true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
[true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
[true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
[true, {
name: 'RSA-PSS',
hash: 'SHA-256',
modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
publicExponent: new Uint8Array([1, 0, 1]),
}],
[false, {
name: 'RSASSA-PKCS1-v1_5',
hash: 'SHA-256',
modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
publicExponent: new Uint8Array([1, 0, 1]),
}],
[false, {
name: 'RSA-PSS',
hash: 'SHA-256',
...RSA_KEY_GEN,
publicExponent: new Uint8Array([2]),
}],
[false, {
name: 'RSA-OAEP',
hash: 'SHA-256',
...RSA_KEY_GEN,
publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
}],
[true, { name: 'ECDSA', namedCurve: 'P-256' }],
[false, { name: 'ECDSA', namedCurve: 'X25519' }],
[true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
'deriveBits': [
[true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
[true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
[true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
[false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
[false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
[false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
[false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
'get key length': [
[false, { name: 'HMAC', hash: 'SHA-256' }],
],
'get shared key length': [
[false, 'ML-KEM-768'],
],
};
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
crypto: improve SubtleCrypto.supports() accuracy#65222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

nodejs-github-bot
merged 3 commits into

from

Aug 13, 2026
 Merged


crypto: improve SubtleCrypto.supports() accuracy
#65222
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
2916d54

crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
6a1ac54

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026
51bf88d

fixup! crypto: improve SubtleCrypto.supports() accuracy


panva Aug 11, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 8 additions & 2 deletions
lib/internal/crypto/hkdf.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ const {
const { kMaxLength } = require('buffer');

const {
 getDigestSizeInBytes,
 jobPromise,
 normalizeHashName,
 toBuf,
Expand DownExpand Up@@ -141,19 +142,24 @@ function hkdfSync(hash, key, salt, info, length) {
 return bits;
}

function validateHkdfDeriveBitsLength(length) {
function validateHkdfDeriveBitsLength(length, hash) {
 if (length === null)
 throw lazyDOMException('length cannot be null', 'OperationError');
 if (length % 8) {
 throw lazyDOMException(
 'length must be a multiple of 8',
 'OperationError');
 }
 if (length > 255 * getDigestSizeInBytes(hash.name) * 8) {
 throw lazyDOMException(
 'length exceeds the maximum derived bit length',
 'OperationError');
 }
}

function hkdfDeriveBits(algorithm, baseKey, length) {
 validateHkdfDeriveBitsLength(length);
 const { hash, salt, info } = algorithm;
 validateHkdfDeriveBitsLength(length, hash);

 if (length === 0)
 return PromiseResolve(new ArrayBuffer(0));
Expand Down

13 changes: 1 addition & 12 deletions
lib/internal/crypto/rsa.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,12 +103,6 @@ function rsaKeyGenerate(
 extractable,
 usages,
) {
 const publicExponentConverted = bigIntArrayToUnsignedInt(algorithm.publicExponent);
 if (publicExponentConverted === undefined) {
 throw lazyDOMException(
 'The publicExponent must be equivalent to an unsigned 32-bit value',
 'OperationError');
 }
 const {
 name,
 modulusLength,
Expand All@@ -118,6 +112,7 @@ function rsaKeyGenerate(

 const allowedUsages = kUsages[name];
 const usagesSet = validateKeyUsages(usages, allowedUsages.keygen, name);
 const publicExponentConverted = bigIntArrayToUnsignedInt(publicExponent);

 const keyAlgorithm = {
 name,
Expand All@@ -126,12 +121,6 @@ function rsaKeyGenerate(
 hash,
 };

 if (publicExponentConverted < 3 || publicExponentConverted % 2 === 0) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 'OperationError');
 }

 const keyUsages = getKeyPairUsages(usagesSet, allowedUsages);
 validateUsagesNotEmpty(keyUsages.private);

Expand Down

12 changes: 9 additions & 3 deletions
lib/internal/crypto/util.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,20 +349,23 @@ const kAlgorithmDefinitions = {
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-768': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'ML-KEM-1024': {
 'generateKey': null,
 'exportKey': null,
 'importKey': null,
 'encapsulate': null,
 'decapsulate': null,
 'get shared key length': null,
 },
 'PBKDF2': {
 'importKey': null,
Expand DownExpand Up@@ -894,15 +897,18 @@ function jobPromiseThen(promise, onFulfilled, onRejected) {
// an unsigned int from a Buffer are not adequate. The implementation
// here is adapted from the chromium implementation here:
// https://github.com/chromium/chromium/blob/HEAD/third_party/blink/public/platform/web_crypto_algorithm_params.h, but ported to JavaScript
// Returns undefined if the conversion was unsuccessful.
// Throws an OperationError if the value does not fit in an unsigned 32-bit integer.
function bigIntArrayToUnsignedInt(input) {
 let result = 0;
 const length = TypedArrayPrototypeGetLength(input);

 for (let n = 0; n < length; ++n) {
 const n_reversed = length - n - 1;
 if (n_reversed >= 4 && input[n])
 return; // Too large
 if (n_reversed >= 4 && input[n]) {
 throw lazyDOMException(
 'algorithm.publicExponent must fit in an unsigned 32-bit integer',
 'OperationError');
 }
 result |= input[n] << 8 * n_reversed;
 }

Expand Down

85 changes: 58 additions & 27 deletions
lib/internal/crypto/webcrypto.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -348,6 +348,54 @@ function getKeyLength({ name, length, hash }) {
 }
}

function getSharedKeyLength({ name }) {
 switch (name) {
 case 'ML-KEM-512':
 // Fall through
 case 'ML-KEM-768':
 // Fall through
 case 'ML-KEM-1024':
 return 256;
 /* c8 ignore start */
 default: {
 const assert = require('internal/assert');
 assert.fail('Unreachable code');
 }
 /* c8 ignore stop */
 }
}

function canImportRawSecret(algorithm, sharedKeyLength) {
 switch (algorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 return sharedKeyLength === 128 ||
 sharedKeyLength === 192 ||
 sharedKeyLength === 256;
 case 'ChaCha20-Poly1305':
 return sharedKeyLength === 256;
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 return true;
 case 'HMAC':
 if (sharedKeyLength === 0)
 return false;
 // Fall through
 case 'KMAC128':
 case 'KMAC256':
 return algorithm.length === undefined ||
 numBitsToBytes(algorithm.length) * 8 === sharedKeyLength;
 default:
 return false;
 }
}

function deriveKey(
 algorithm,
 baseKey,
Expand DownExpand Up@@ -1741,37 +1789,19 @@ class SubtleCrypto {
 },
 );

 let sharedKeyLength;
 let normalizedAdditionalAlgorithm;
 try {
 const normalizedAlgorithm =
 normalizeAlgorithm(algorithm, 'get shared key length');
 sharedKeyLength = getSharedKeyLength(normalizedAlgorithm);
 normalizedAdditionalAlgorithm = normalizeAlgorithm(additionalAlgorithm, 'importKey');
 } catch {
 return false;
 }

 switch (normalizedAdditionalAlgorithm.name) {
 case 'AES-OCB':
 case 'AES-KW':
 case 'AES-GCM':
 case 'AES-CTR':
 case 'AES-CBC':
 case 'ChaCha20-Poly1305':
 case 'HKDF':
 case 'PBKDF2':
 case 'Argon2i':
 case 'Argon2d':
 case 'Argon2id':
 break;
 case 'HMAC':
 case 'KMAC128':
 case 'KMAC256':
 if (normalizedAdditionalAlgorithm.length === undefined ||
 numBitsToBytes(normalizedAdditionalAlgorithm.length) === 32) {
 break;
 }
 return false;
 default:
 return false;
 }
 if (!canImportRawSecret(normalizedAdditionalAlgorithm, sharedKeyLength))
 return false;
 }

 try {
Expand DownExpand Up@@ -1807,8 +1837,6 @@ function check(op, alg, length) {
 }

 switch (op) {
 case 'decapsulate':
 case 'decrypt':
 case 'digest': {
 if ((normalizedAlgorithm.name === 'cSHAKE128' ||
 normalizedAlgorithm.name === 'cSHAKE256') &&
Expand All@@ -1818,6 +1846,8 @@ function check(op, alg, length) {
 }
 return true;
 }
 case 'decapsulate':
 case 'decrypt':
 case 'encapsulate':
 case 'encrypt':
 case 'exportKey':
Expand All@@ -1829,7 +1859,8 @@ function check(op, alg, length) {
 return true;
 case 'deriveBits': {
 if (normalizedAlgorithm.name === 'HKDF') {
 require('internal/crypto/hkdf').validateHkdfDeriveBitsLength(length);
 require('internal/crypto/hkdf')
 .validateHkdfDeriveBitsLength(length, normalizedAlgorithm.hash);
 }

 if (normalizedAlgorithm.name === 'PBKDF2') {
Expand Down

40 changes: 36 additions & 4 deletions
lib/internal/crypto/webidl.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ const {
 getCryptoKeyType,
} = require('internal/crypto/keys');
const {
 bigIntArrayToUnsignedInt,
 validateMaxBufferLength,
 getBufferSourceByteLength,
 getBufferSourceBytes,
Expand All@@ -41,6 +42,8 @@ const {
 type,
} = require('internal/webidl');

const kRsaKeyGenMinimumModulusLength = isFips ? 2048 : 512;

function validateByteLength(buf, name, target) {
 if (getBufferSourceByteLength(buf) !== target) {
 throw lazyDOMException(
Expand DownExpand Up@@ -152,11 +155,33 @@ const dictRsaKeyGenParams = [
 key: 'modulusLength',
 converter: (V, opts) =>
 converters['unsigned long'](V, enforceRangeOptions(opts)),
 validator: (modulusLength) => {
 if (modulusLength < kRsaKeyGenMinimumModulusLength) {
 throw lazyDOMException(
 `algorithm.modulusLength must be at least ${kRsaKeyGenMinimumModulusLength}`,
 'OperationError');
 }
 },
 required: true,
 },
 {
 key: 'publicExponent',
 converter: converters.BigInteger,
 validator: (publicExponent) => {
 const converted = bigIntArrayToUnsignedInt(publicExponent);

 if (converted < 3) {
 throw lazyDOMException(
 'algorithm.publicExponent must be at least 3',
 'OperationError');
 }

 if (converted % 2 === 0) {
 throw lazyDOMException(
 'algorithm.publicExponent must be odd',
 'OperationError');
 }
 },
 required: true,
 },
];
Expand DownExpand Up@@ -625,20 +650,27 @@ converters.ContextParams = createDictionaryConverter(
 key: 'context',
 converter: converters.BufferSource,
 validator(V, dict) {
 const validateLength = (V) =>
 validateMaxBufferLength(V, 'ContextParams.context', 255);

 if (process.features.openssl_is_boringssl) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 let { 0: major, 1: minor } =
 StringPrototypeSplit(process.versions.openssl, '.');
 major = NumberParseInt(major, 10);
 minor = NumberParseInt(minor, 10);
 if (major > 3 || (major === 3 && minor >= 2)) {
 this.validator = undefined;
 this.validator = validateLength;
 } else {
 this.validator = validateZeroLength('ContextParams.context');
 this.validator(V, dict);
 const validateEmpty = validateZeroLength('ContextParams.context');
 this.validator = (V, dict) => {
 validateLength(V);
 validateEmpty(V, dict);
 };
 }
 }
 this.validator(V, dict);
 },
 },
 ],
Expand Down

32 changes: 32 additions & 0 deletions
test/fixtures/webcrypto/supports-level-2.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import { getFips } from 'node:crypto';

const { subtle } = globalThis.crypto;
const RSA_MINIMUM_MODULUS_LENGTH = getFips() === 1 ? 2048 : 512;

const RSA_KEY_GEN = {
 modulusLength: 2048,
Expand DownExpand Up@@ -66,6 +69,30 @@ export const vectors = {
 [true, { name: 'RSASSA-PKCS1-v1_5', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-PSS', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, { name: 'RSA-OAEP', hash: 'SHA-256', ...RSA_KEY_GEN }],
 [true, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSASSA-PKCS1-v1_5',
 hash: 'SHA-256',
 modulusLength: RSA_MINIMUM_MODULUS_LENGTH - 1,
 publicExponent: new Uint8Array([1, 0, 1]),
 }],
 [false, {
 name: 'RSA-PSS',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([2]),
 }],
 [false, {
 name: 'RSA-OAEP',
 hash: 'SHA-256',
 ...RSA_KEY_GEN,
 publicExponent: new Uint8Array([1, 0, 0, 0, 1]),
 }],
 [true, { name: 'ECDSA', namedCurve: 'P-256' }],
 [false, { name: 'ECDSA', namedCurve: 'X25519' }],
 [true, { name: 'AES-CTR', length: 128 }],
Expand DownExpand Up@@ -146,6 +173,8 @@ export const vectors = {
 'deriveBits': [
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 0],
 [true, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65280],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 65288],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, null],
 [false, { name: 'HKDF', hash: 'SHA-256', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 7],
 [false, { name: 'HKDF', hash: 'Invalid', salt: Buffer.alloc(0), info: Buffer.alloc(0) }, 8],
Expand DownExpand Up@@ -234,4 +263,7 @@ export const vectors = {
 'get key length': [
 [false, { name: 'HMAC', hash: 'SHA-256' }],
 ],
 'get shared key length': [
 [false, 'ML-KEM-768'],
 ],
};
Loading
Loading