crypto: avoid calls to promise.catch()

Renegade334 · aduh95 · commit aed9fd5ac4f6 · 2025-10-11T20:49:13.000+02:00
This avoids explicit calls to the user-mutable `%Promise.prototype%.catch`, and by association, implicit calls to the user-mutable `%Promise.prototype%.then`. PR-URL: #59841 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Jordan Harband <ljharb@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com>
diff --git a/lib/internal/crypto/aes.js b/lib/internal/crypto/aes.js
@@ -195,12 +195,15 @@ async function aesGenerateKey(algorithm, extractable, keyUsages) {
 'SyntaxError');
 }
 
- const key = await generateKey('aes', { length }).catch((err) => {
+ let key;
+ try {
+ key = await generateKey('aes', { length });
+ } catch (err) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason' +
 `[${err.message}]`,
 { name: 'OperationError', cause: err });
- });
+ }
 
 return new InternalCryptoKey(
 key,
diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
@@ -148,11 +148,14 @@ async function cfrgGenerateKey(algorithm, extractable, keyUsages) {
 break;
 }
 
- const keyPair = await generateKeyPair(genKeyType).catch((err) => {
+ let keyPair;
+ try {
+ keyPair = await generateKeyPair(genKeyType);
+ } catch (err) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 { name: 'OperationError', cause: err });
- });
+ }
 
 let publicUsages;
 let privateUsages;
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -96,11 +96,14 @@ async function ecGenerateKey(algorithm, extractable, keyUsages) {
 // Fall through
 }
 
- const keypair = await generateKeyPair('ec', { namedCurve }).catch((err) => {
+ let keyPair;
+ try {
+ keyPair = await generateKeyPair('ec', { namedCurve });
+ } catch(err) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 { name: 'OperationError', cause: err });
- });
+ }
 
 let publicUsages;
 let privateUsages;
@@ -119,14 +122,14 @@ async function ecGenerateKey(algorithm, extractable, keyUsages) {
 
 const publicKey =
 new InternalCryptoKey(
- keypair.publicKey,
+ keyPair.publicKey,
 keyAlgorithm,
 publicUsages,
 true);
 
 const privateKey =
 new InternalCryptoKey(
- keypair.privateKey,
+ keyPair.privateKey,
 keyAlgorithm,
 privateUsages,
 extractable);
diff --git a/lib/internal/crypto/mac.js b/lib/internal/crypto/mac.js
@@ -54,11 +54,14 @@ async function hmacGenerateKey(algorithm, extractable, keyUsages) {
 'SyntaxError');
 }
 
- const key = await generateKey('hmac', { length }).catch((err) => {
+ let key;
+ try {
+ key = await generateKey('hmac', { length });
+ } catch (err) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 { name: 'OperationError', cause: err });
- });
+ }
 
 return new InternalCryptoKey(
 key,
diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js
@@ -148,14 +148,17 @@ async function rsaKeyGenerate(
 }
 }
 
- const keypair = await generateKeyPair('rsa', {
- modulusLength,
- publicExponent: publicExponentConverted,
- }).catch((err) => {
+ let keyPair;
+ try {
+ keyPair = await generateKeyPair('rsa', {
+ modulusLength,
+ publicExponent: publicExponentConverted,
+ });
+ } catch (err) {
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
 { name: 'OperationError', cause: err });
- });
+ }
 
 const keyAlgorithm = {
 name,
@@ -181,14 +184,14 @@ async function rsaKeyGenerate(
 
 const publicKey =
 new InternalCryptoKey(
- keypair.publicKey,
+ keyPair.publicKey,
 keyAlgorithm,
 publicUsages,
 true);
 
 const privateKey =
 new InternalCryptoKey(
- keypair.privateKey,
+ keyPair.privateKey,
 keyAlgorithm,
 privateUsages,
 extractable);

-Original file line number
+Diff line change
 'SyntaxError');
+}
 -constkey=awaitgenerateKey('aes',{ length }).catch((err)=>{
 +letkey;
 +try{
 +key=awaitgenerateKey('aes',{ length });
 +}catch(err){
 throwlazyDOMException(
 'The operation failed for an operation-specific reason'+
 `[${err.message}]`,
 {name: 'OperationError',cause: err});
 -});
 +}
 returnnewInternalCryptoKey(
 key,