crypto: use async functions for non-stub Promise-returning functions

Renegade334 · aduh95 · commit f488b2ff73e3 · 2025-10-11T20:49:13.000+02:00
These were intended to mimic simple async functions, but exceptions thrown in the function body would be returned synchronously, not wrapped in a rejected Promise. 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
@@ -5,7 +5,6 @@ const {
 ArrayBufferPrototypeSlice,
 ArrayFrom,
 ArrayPrototypePush,
- PromiseReject,
 SafeSet,
 TypedArrayPrototypeSlice,
 } = primordials;
@@ -132,7 +131,7 @@ function asyncAesKwCipher(mode, key, data) {
 getVariant('AES-KW', key.algorithm.length)));
 }
 
-function asyncAesGcmCipher(mode, key, data, algorithm) {
+async function asyncAesGcmCipher(mode, key, data, algorithm) {
 const { tagLength = 128 } = algorithm;
 
 const tagByteLength = tagLength / 8;
@@ -148,9 +147,9 @@ function asyncAesGcmCipher(mode, key, data, algorithm) {
 // > If *plaintext* has a length less than *tagLength* bits, then `throw`
 // > an `OperationError`.
 if (tagByteLength > tag.byteLength) {
- return PromiseReject(lazyDOMException(
+ throw lazyDOMException(
 'The provided data is too small.',
- 'OperationError'));
+ 'OperationError');
 }
 
 data = slice(data, 0, -tagByteLength);
diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
@@ -342,7 +342,7 @@ function cfrgImportKey(
 extractable);
 }
 
-function eddsaSignVerify(key, data, algorithm, signature) {
+async function eddsaSignVerify(key, data, algorithm, signature) {
 const mode = signature === undefined ? kSignJobModeSign : kSignJobModeVerify;
 const type = mode === kSignJobModeSign ? 'private' : 'public';
 
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -283,7 +283,7 @@ function ecImportKey(
 extractable);
 }
 
-function ecdsaSignVerify(key, data, { name, hash }, signature) {
+async function ecdsaSignVerify(key, data, { name, hash }, signature) {
 const mode = signature === undefined ? kSignJobModeSign : kSignJobModeVerify;
 const type = mode === kSignJobModeSign ? 'private' : 'public';
 
diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js
@@ -91,7 +91,7 @@ function validateRsaOaepAlgorithm(algorithm) {
 }
 }
 
-function rsaOaepCipher(mode, key, data, algorithm) {
+async function rsaOaepCipher(mode, key, data, algorithm) {
 validateRsaOaepAlgorithm(algorithm);
 
 const type = mode === kWebCryptoCipherEncrypt ? 'public' : 'private';
@@ -328,7 +328,7 @@ function rsaImportKey(
 }, keyUsages, extractable);
 }
 
-function rsaSignVerify(key, data, { saltLength }, signature) {
+async function rsaSignVerify(key, data, { saltLength }, signature) {
 const mode = signature === undefined ? kSignJobModeSign : kSignJobModeVerify;
 const type = mode === kSignJobModeSign ? 'private' : 'public';
 
diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js
@@ -769,7 +769,7 @@ async function unwrapKey(
 );
 }
 
-function signVerify(algorithm, key, data, signature) {
+async function signVerify(algorithm, key, data, signature) {
 let usage = 'sign';
 if (signature !== undefined) {
 usage = 'verify';

-Original file line number
+Diff line change
  ArrayBufferPrototypeSlice,
  ArrayFrom,
  ArrayPrototypePush,
 - PromiseReject,
  SafeSet,
  TypedArrayPrototypeSlice,
 }=primordials;
 getVariant('AES-KW',key.algorithm.length)));
+}
 -functionasyncAesGcmCipher(mode,key,data,algorithm){
 +asyncfunctionasyncAesGcmCipher(mode,key,data,algorithm){
 const{ tagLength =128}=algorithm;
 consttagByteLength=tagLength/8;
 // > If *plaintext* has a length less than *tagLength* bits, then `throw`
 // > an `OperationError`.
 if(tagByteLength>tag.byteLength){
 -returnPromiseReject(lazyDOMException(
 +throwlazyDOMException(
 'The provided data is too small.',
 -'OperationError'));
 +'OperationError');
+}
 data=slice(data,0,-tagByteLength);
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ function cfrgImportKey(`
`342`	`342`	`extractable);`
`343`	`343`	`}`
`344`	`344`
`345`		`-functioneddsaSignVerify(key,data,algorithm,signature){`
	`345`	`+asyncfunctioneddsaSignVerify(key,data,algorithm,signature){`
`346`	`346`	`constmode=signature===undefined ? kSignJobModeSign : kSignJobModeVerify;`
`347`	`347`	`consttype=mode===kSignJobModeSign ? 'private' : 'public';`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ function ecImportKey(`
`283`	`283`	`extractable);`
`284`	`284`	`}`
`285`	`285`
`286`		`-functionecdsaSignVerify(key,data,{ name, hash },signature){`
	`286`	`+asyncfunctionecdsaSignVerify(key,data,{ name, hash },signature){`
`287`	`287`	`constmode=signature===undefined ? kSignJobModeSign : kSignJobModeVerify;`
`288`	`288`	`consttype=mode===kSignJobModeSign ? 'private' : 'public';`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ function validateRsaOaepAlgorithm(algorithm) {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`-functionrsaOaepCipher(mode,key,data,algorithm){`
	`94`	`+asyncfunctionrsaOaepCipher(mode,key,data,algorithm){`
`95`	`95`	`validateRsaOaepAlgorithm(algorithm);`
`96`	`96`
`97`	`97`	`consttype=mode===kWebCryptoCipherEncrypt ? 'public' : 'private';`
`@@ -328,7 +328,7 @@ function rsaImportKey(`
`328`	`328`	`},keyUsages,extractable);`
`329`	`329`	`}`
`330`	`330`
`331`		`-functionrsaSignVerify(key,data,{ saltLength },signature){`
	`331`	`+asyncfunctionrsaSignVerify(key,data,{ saltLength },signature){`
`332`	`332`	`constmode=signature===undefined ? kSignJobModeSign : kSignJobModeVerify;`
`333`	`333`	`consttype=mode===kSignJobModeSign ? 'private' : 'public';`
`334`	`334`
Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ async function unwrapKey(`
`769`	`769`	`);`
`770`	`770`	`}`
`771`	`771`
`772`		`-functionsignVerify(algorithm,key,data,signature){`
	`772`	`+asyncfunctionsignVerify(algorithm,key,data,signature){`
`773`	`773`	`letusage='sign';`
`774`	`774`	`if(signature!==undefined){`
`775`	`775`	`usage='verify';`