crypto: use return await when returning Promises from async functions

This offers _some_ resistance to `%Promise.prototype%` pollution.

Refs: #59699
PR-URL: #59841
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Jordan Harband <[email protected]>
Reviewed-By: Filip Skokan <[email protected]>

Author: Renegade334

lib/internal/crypto/aes.js

@@ -160,7 +160,7 @@ async function asyncAesGcmCipher(mode, key, data, algorithm) {
       break;
   }
 
-  return jobPromise(() => new AESCipherJob(
+  return await jobPromise(() => new AESCipherJob(
     kCryptoJobAsync,
     mode,
     key[kKeyObject][kHandle],

lib/internal/crypto/cfrg.js

@@ -349,7 +349,7 @@ async function eddsaSignVerify(key, data, algorithm, signature) {
   if (key.type !== type)
     throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
-  return jobPromise(() => new SignJob(
+  return await jobPromise(() => new SignJob(
     kCryptoJobAsync,
     mode,
     key[kKeyObject][kHandle],

lib/internal/crypto/ec.js

@@ -99,7 +99,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 });
@@ -292,7 +292,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],

lib/internal/crypto/rsa.js

@@ -101,7 +101,7 @@ async function rsaOaepCipher(mode, key, data, algorithm) {
       'InvalidAccessError');
   }
 
-  return jobPromise(() => new RSACipherJob(
+  return await jobPromise(() => new RSACipherJob(
     kCryptoJobAsync,
     mode,
     key[kKeyObject][kHandle],
@@ -335,7 +335,7 @@ async function rsaSignVerify(key, data, { saltLength }, signature) {
   if (key.type !== type)
     throw lazyDOMException(`Key must be a ${type} key`, 'InvalidAccessError');
 
-  return jobPromise(() => {
+  return await jobPromise(() => {
     if (key.algorithm.name === 'RSA-PSS') {
       validateInt32(
         saltLength,

lib/internal/crypto/webcrypto.js

@@ -80,7 +80,7 @@ async function digest(algorithm, data) {
 
   algorithm = normalizeAlgorithm(algorithm, 'digest');
 
-  return ReflectApply(asyncDigest, this, [algorithm, data]);
+  return await ReflectApply(asyncDigest, this, [algorithm, data]);
 }
 
 function randomUUID() {
@@ -210,13 +210,13 @@ async function deriveBits(algorithm, baseKey, length = null) {
     case 'X448':
       // Fall through
     case 'ECDH':
-      return require('internal/crypto/diffiehellman')
+      return await require('internal/crypto/diffiehellman')
         .ecdhDeriveBits(algorithm, baseKey, length);
     case 'HKDF':
-      return require('internal/crypto/hkdf')
+      return await require('internal/crypto/hkdf')
         .hkdfDeriveBits(algorithm, baseKey, length);
     case 'PBKDF2':
-      return require('internal/crypto/pbkdf2')
+      return await require('internal/crypto/pbkdf2')
         .pbkdf2DeriveBits(algorithm, baseKey, length);
   }
   throw lazyDOMException('Unrecognized algorithm name', 'NotSupportedError');
@@ -327,12 +327,12 @@ async function exportKeySpki(key) {
     case 'RSA-PSS':
       // Fall through
     case 'RSA-OAEP':
-      return require('internal/crypto/rsa')
+      return await require('internal/crypto/rsa')
         .rsaExportKey(key, kWebCryptoKeyFormatSPKI);
     case 'ECDSA':
       // Fall through
     case 'ECDH':
-      return require('internal/crypto/ec')
+      return await require('internal/crypto/ec')
         .ecExportKey(key, kWebCryptoKeyFormatSPKI);
     case 'Ed25519':
       // Fall through
@@ -341,7 +341,7 @@ async function exportKeySpki(key) {
     case 'X25519':
       // Fall through
     case 'X448':
-      return require('internal/crypto/cfrg')
+      return await require('internal/crypto/cfrg')
         .cfrgExportKey(key, kWebCryptoKeyFormatSPKI);
     default:
       return undefined;
@@ -355,12 +355,12 @@ async function exportKeyPkcs8(key) {
     case 'RSA-PSS':
       // Fall through
     case 'RSA-OAEP':
-      return require('internal/crypto/rsa')
+      return await require('internal/crypto/rsa')
         .rsaExportKey(key, kWebCryptoKeyFormatPKCS8);
     case 'ECDSA':
       // Fall through
     case 'ECDH':
-      return require('internal/crypto/ec')
+      return await require('internal/crypto/ec')
         .ecExportKey(key, kWebCryptoKeyFormatPKCS8);
     case 'Ed25519':
       // Fall through
@@ -369,7 +369,7 @@ async function exportKeyPkcs8(key) {
     case 'X25519':
       // Fall through
     case 'X448':
-      return require('internal/crypto/cfrg')
+      return await require('internal/crypto/cfrg')
         .cfrgExportKey(key, kWebCryptoKeyFormatPKCS8);
     default:
       return undefined;
@@ -381,7 +381,7 @@ async function exportKeyRawPublic(key) {
     case 'ECDSA':
       // Fall through
     case 'ECDH':
-      return require('internal/crypto/ec')
+      return await require('internal/crypto/ec')
         .ecExportKey(key, kWebCryptoKeyFormatRaw);
     case 'Ed25519':
       // Fall through
@@ -390,7 +390,7 @@ async function exportKeyRawPublic(key) {
     case 'X25519':
       // Fall through
     case 'X448':
-      return require('internal/crypto/cfrg')
+      return await require('internal/crypto/cfrg')
         .cfrgExportKey(key, kWebCryptoKeyFormatRaw);
     default:
       return undefined;
@@ -682,7 +682,7 @@ async function wrapKey(format, key, wrappingKey, algorithm) {
     }
   }
 
-  return cipherOrWrap(
+  return await cipherOrWrap(
     kWebCryptoCipherEncrypt,
     algorithm,
     wrappingKey,
@@ -787,19 +787,19 @@ async function signVerify(algorithm, key, data, signature) {
     case 'RSA-PSS':
       // Fall through
     case 'RSASSA-PKCS1-v1_5':
-      return require('internal/crypto/rsa')
+      return await require('internal/crypto/rsa')
         .rsaSignVerify(key, data, algorithm, signature);
     case 'ECDSA':
-      return require('internal/crypto/ec')
+      return await require('internal/crypto/ec')
         .ecdsaSignVerify(key, data, algorithm, signature);
     case 'Ed25519':
       // Fall through
     case 'Ed448':
       // Fall through
-      return require('internal/crypto/cfrg')
+      return await require('internal/crypto/cfrg')
         .eddsaSignVerify(key, data, algorithm, signature);
     case 'HMAC':
-      return require('internal/crypto/mac')
+      return await require('internal/crypto/mac')
         .hmacSignVerify(key, data, algorithm, signature);
   }
   throw lazyDOMException('Unrecognized algorithm name', 'NotSupportedError');
@@ -824,7 +824,7 @@ async function sign(algorithm, key, data) {
     context: '3rd argument',
   });
 
-  return signVerify(algorithm, key, data);
+  return await signVerify(algorithm, key, data);
 }
 
 async function verify(algorithm, key, signature, data) {
@@ -850,7 +850,7 @@ async function verify(algorithm, key, signature, data) {
     context: '4th argument',
   });
 
-  return signVerify(algorithm, key, data, signature);
+  return await signVerify(algorithm, key, data, signature);
 }
 
 async function cipherOrWrap(mode, algorithm, key, data, op) {
@@ -873,18 +873,18 @@ async function cipherOrWrap(mode, algorithm, key, data, op) {
 
   switch (algorithm.name) {
     case 'RSA-OAEP':
-      return require('internal/crypto/rsa')
+      return await require('internal/crypto/rsa')
         .rsaCipher(mode, key, data, algorithm);
     case 'AES-CTR':
       // Fall through
     case 'AES-CBC':
       // Fall through
     case 'AES-GCM':
-      return require('internal/crypto/aes')
+      return await require('internal/crypto/aes')
         .aesCipher(mode, key, data, algorithm);
     case 'AES-KW':
       if (op === 'wrapKey' || op === 'unwrapKey') {
-        return require('internal/crypto/aes')
+        return await require('internal/crypto/aes')
           .aesCipher(mode, key, data, algorithm);
       }
   }
@@ -911,7 +911,13 @@ async function encrypt(algorithm, key, data) {
   });
 
   algorithm = normalizeAlgorithm(algorithm, 'encrypt');
-  return cipherOrWrap(kWebCryptoCipherEncrypt, algorithm, key, data, 'encrypt');
+  return await cipherOrWrap(
+    kWebCryptoCipherEncrypt,
+    algorithm,
+    key,
+    data,
+    'encrypt',
+  );
 }
 
 async function decrypt(algorithm, key, data) {
@@ -934,7 +940,13 @@ async function decrypt(algorithm, key, data) {
   });
 
   algorithm = normalizeAlgorithm(algorithm, 'decrypt');
-  return cipherOrWrap(kWebCryptoCipherDecrypt, algorithm, key, data, 'decrypt');
+  return await cipherOrWrap(
+    kWebCryptoCipherDecrypt,
+    algorithm,
+    key,
+    data,
+    'decrypt',
+  );
 }
 
 // The SubtleCrypto and Crypto classes are defined as part of the