@@ -16,6 +16,7 @@ const {
 } = internalBinding('crypto');
 
 const {
+  isInt32,
   validateFunction,
   validateInt32,
   validateString,
@@ -98,7 +99,7 @@ function check(password, salt, iterations, keylen, digest) {
   return { password, salt, iterations, keylen, digest };
 }
 
-function validatePbkdf2DeriveBitsLength(length) {
+function validatePbkdf2DeriveBits({ iterations }, length) {
   if (length === null)
     throw lazyDOMException('length cannot be null', 'OperationError');
 
@@ -107,10 +108,16 @@ function validatePbkdf2DeriveBitsLength(length) {
       'length must be a multiple of 8',
       'OperationError');
   }
+  if (iterations === 0)
+    throw lazyDOMException('iterations cannot be zero', 'OperationError');
+  if (length !== 0 && !isInt32(iterations)) {
+    throw lazyDOMException(
+      'iterations exceeds the implementation limit', 'OperationError');
+  }
 }
 
 function pbkdf2DeriveBits(algorithm, baseKey, length) {
-  validatePbkdf2DeriveBitsLength(length);
+  validatePbkdf2DeriveBits(algorithm, length);
   const { iterations, hash, salt } = algorithm;
 
   if (length === 0)
@@ -129,5 +136,5 @@ module.exports = {
   pbkdf2,
   pbkdf2Sync,
   pbkdf2DeriveBits,
-  validatePbkdf2DeriveBitsLength,
+  validatePbkdf2DeriveBits,
 };
@@ -1937,7 +1937,7 @@ function check(op, alg, length) {
       }
 
       if (normalizedAlgorithm.name === 'PBKDF2') {
-        require('internal/crypto/pbkdf2').validatePbkdf2DeriveBitsLength(length);
+        require('internal/crypto/pbkdf2').validatePbkdf2DeriveBits(normalizedAlgorithm, length);
       }
 
       if (StringPrototypeStartsWith(normalizedAlgorithm.name, 'Argon2')) {
 
@@ -15,7 +15,6 @@ const {
   kEmptyObject,
 } = require('internal/util');
 const {
-  isInt32,
   isUint32,
 } = require('internal/validators');
 const {
@@ -492,15 +491,6 @@ converters.Pbkdf2Params = createDictionaryConverter(
         key: 'iterations',
         converter: (V, opts) =>
           converters['unsigned long'](V, enforceRangeOptions(opts)),
-        validator: (V, dict) => {
-          if (V === 0)
-            throw lazyDOMException('iterations cannot be zero', 'OperationError');
-          if (!isInt32(V)) {
-            throw lazyDOMException(
-              'iterations exceeds the implementation limit',
-              'NotSupportedError');
-          }
-        },
         required: true,
       },
       {
 
@@ -136,7 +136,7 @@ const rejectsXCurves = hasFIPS(3, 5);
         salt: new Uint8Array([2]),
         iterations: 2 ** 31,
       }, key, 8),
-      { name: 'NotSupportedError' });
+      { name: 'OperationError' });
   }
 
   test().then(common.mustCall());
 
@@ -0,0 +1,21 @@
+'use strict';
+
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+const { subtle } = globalThis.crypto;
+
+(async () => {
+  const key = await subtle.importKey('raw', new Uint8Array(16), 'PBKDF2', false, ['deriveBits']);
+  for (const iterations of [2 ** 31, 2 ** 32 - 1]) {
+    const algorithm = { name: 'PBKDF2', hash: 'SHA-256', salt: new Uint8Array(16), iterations };
+    assert.strictEqual((await subtle.deriveBits(algorithm, key, 0)).byteLength, 0);
+    assert.strictEqual(SubtleCrypto.supports('deriveBits', algorithm, 0), true);
+    assert.strictEqual(SubtleCrypto.supports('deriveBits', algorithm, 8), false);
+    await assert.rejects(subtle.deriveBits(algorithm, key, 8), { name: 'OperationError' });
+  }
+  const algorithm = { name: 'PBKDF2', hash: 'SHA-256', salt: new Uint8Array(16), iterations: 0 };
+  await assert.rejects(subtle.deriveBits(algorithm, key, 0), { name: 'OperationError' });
+})().then(common.mustCall());
Original file line number	Diff line number	Diff line change
`@@ -1937,7 +1937,7 @@ function check(op, alg, length) {`
`1937`	`1937`	`}`
`1938`	`1938`
`1939`	`1939`	`if (normalizedAlgorithm.name === 'PBKDF2') {`
`1940`		`- require('internal/crypto/pbkdf2').validatePbkdf2DeriveBitsLength(length);`
	`1940`	`+ require('internal/crypto/pbkdf2').validatePbkdf2DeriveBits(normalizedAlgorithm, length);`
`1941`	`1941`	`}`
`1942`	`1942`
`1943`	`1943`	`if (StringPrototypeStartsWith(normalizedAlgorithm.name, 'Argon2')) {`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ const rejectsXCurves = hasFIPS(3, 5);`
`136`	`136`	`salt: new Uint8Array([2]),`
`137`	`137`	`iterations: 2 ** 31,`
`138`	`138`	`}, key, 8),`
`139`		`- { name: 'NotSupportedError' });`
	`139`	`+ { name: 'OperationError' });`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`test().then(common.mustCall());`