crypto: use return await when returning Promises from async functions

Renegade334 · targos · commit 647c33270475 · 2025-09-24T09:03:33.000+02:00
This offers _some_ resistance to `%Promise.prototype%` pollution. Refs: #59699 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
@@ -172,7 +172,7 @@ async function asyncAesGcmCipher(mode, key, data, algorithm){
 break;
 }
 
- return jobPromise(() => new AESCipherJob(
+ return await jobPromise(() => new AESCipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
@@ -209,7 +209,7 @@ async function asyncAesOcbCipher(mode, key, data, algorithm){
 break;
 }
 
- return jobPromise(() => new AESCipherJob(
+ return await jobPromise(() => new AESCipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
@@ -350,7 +350,7 @@ async function eddsaSignVerify(key, data, algorithm, signature){
 if (key[kKeyType] !== type)
 throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
- return jobPromise(() => new SignJob(
+ return await jobPromise(() => new SignJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
diff --git a/lib/internal/crypto/chacha20_poly1305.js b/lib/internal/crypto/chacha20_poly1305.js
@@ -68,7 +68,7 @@ async function c20pCipher(mode, key, data, algorithm){
 break;
 }
 
- return jobPromise(() => new ChaCha20Poly1305CipherJob(
+ return await jobPromise(() => new ChaCha20Poly1305CipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -100,7 +100,7 @@ async function ecGenerateKey(algorithm, extractable, keyUsages){
 let keyPair;
 try{
 keyPair = await generateKeyPair('ec',{namedCurve });
- } catch(err){
+ } catch (err){
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
{name: 'OperationError', cause: err });
@@ -293,7 +293,7 @@ async function ecdsaSignVerify(key, data,{name, hash }, signature){
 
 const hashname = normalizeHashName(hash.name);
 
- return jobPromise(() => new SignJob(
+ return await jobPromise(() => new SignJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
diff --git a/lib/internal/crypto/hash.js b/lib/internal/crypto/hash.js
@@ -221,7 +221,7 @@ async function asyncDigest(algorithm, data){
 case 'cSHAKE128':
 // Fall through
 case 'cSHAKE256':
- return jobPromise(() => new HashJob(
+ return await jobPromise(() => new HashJob(
 kCryptoJobAsync,
 normalizeHashName(algorithm.name),
 data,
diff --git a/lib/internal/crypto/ml_dsa.js b/lib/internal/crypto/ml_dsa.js
@@ -294,7 +294,7 @@ async function mlDsaSignVerify(key, data, algorithm, signature){
 if (key[kKeyType] !== type)
 throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
- return jobPromise(() => new SignJob(
+ return await jobPromise(() => new SignJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
diff --git a/lib/internal/crypto/ml_kem.js b/lib/internal/crypto/ml_kem.js
@@ -62,7 +62,7 @@ async function mlKemGenerateKey(algorithm, extractable, keyUsages){
 let keyPair;
 try{
 keyPair = await generateKeyPair(name.toLowerCase());
- } catch(err){
+ } catch (err){
 throw lazyDOMException(
 'The operation failed for an operation-specific reason',
{name: 'OperationError', cause: err });
diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js
@@ -103,7 +103,7 @@ async function rsaOaepCipher(mode, key, data, algorithm){
 'InvalidAccessError');
 }
 
- return jobPromise(() => new RSACipherJob(
+ return await jobPromise(() => new RSACipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
@@ -337,7 +337,7 @@ async function rsaSignVerify(key, data,{saltLength }, signature){
 if (key[kKeyType] !== type)
 throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
- return jobPromise(() =>{
+ return await jobPromise(() =>{
 if (key[kAlgorithm].name === 'RSA-PSS'){
 validateInt32(
 saltLength,
diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js

-Original file line number
+Diff line change
 break;
+}
 -returnjobPromise(()=>newAESCipherJob(
 +returnawaitjobPromise(()=>newAESCipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
 break;
+}
 -returnjobPromise(()=>newAESCipherJob(
 +returnawaitjobPromise(()=>newAESCipherJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ async function c20pCipher(mode, key, data, algorithm){`
`68`	`68`	`break;`
`69`	`69`	`}`
`70`	`70`
`71`		`-returnjobPromise(()=>newChaCha20Poly1305CipherJob(`
	`71`	`+returnawaitjobPromise(()=>newChaCha20Poly1305CipherJob(`
`72`	`72`	`kCryptoJobAsync,`
`73`	`73`	`mode,`
`74`	`74`	`key[kKeyObject][kHandle],`
-Original file line number
+Diff line change
 letkeyPair;
 try{
 keyPair=awaitgenerateKeyPair('ec',{ namedCurve });
 -}catch(err){
 +}catch(err){
 throwlazyDOMException(
 'The operation failed for an operation-specific reason',
 {name: 'OperationError',cause: err});
 consthashname=normalizeHashName(hash.name);
 -returnjobPromise(()=>newSignJob(
 +returnawaitjobPromise(()=>newSignJob(
 kCryptoJobAsync,
 mode,
 key[kKeyObject][kHandle],