crypto: fix webcrypto operation errors to be OperationError

PR-URL: #44171
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Backport-PR-URL: #44872

Author: panva

lib/internal/crypto/aes.js

@@ -7,7 +7,6 @@ const {
   ArrayPrototypeIncludes,
   ArrayPrototypePush,
   MathFloor,
-  Promise,
   SafeSet,
   TypedArrayPrototypeSlice,
 } = primordials;
@@ -46,6 +45,7 @@ const {
 
 const {
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const { PromiseReject } = primordials;
@@ -57,11 +57,12 @@ const {
 } = require('internal/crypto/keys');
 
 const {
-  generateKey,
+  generateKey: _generateKey,
 } = require('internal/crypto/keygen');
 
 const kMaxCounterLength = 128;
 const kTagLengths = [32, 64, 96, 104, 112, 120, 128];
+const generateKey = promisify(_generateKey);
 
 function getAlgorithmName(name, length) {
   switch (name) {
@@ -239,22 +240,19 @@ async function aesGenerateKey(algorithm, extractable, keyUsages) {
       'SyntaxError');
   }
 
-  return new Promise((resolve, reject) => {
-    generateKey('aes', { length }, (err, key) => {
-      if (err) {
-        return reject(lazyDOMException(
-          'The operation failed for an operation-specific reason ' +
-          `[${err.message}]`,
-          'OperationError'));
-      }
-
-      resolve(new InternalCryptoKey(
-        key,
-        { name, length },
-        ArrayFrom(usagesSet),
-        extractable));
-    });
+  const key = await generateKey('aes', { length }).catch((err) => {
+    // TODO(@panva): add err as cause to DOMException
+    throw lazyDOMException(
+      'The operation failed for an operation-specific reason' +
+      `[${err.message}]`,
+      'OperationError');
   });
+
+  return new InternalCryptoKey(
+    key,
+    { name, length },
+    ArrayFrom(usagesSet),
+    extractable);
 }
 
 async function aesImportKey(

lib/internal/crypto/cfrg.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {
-  Promise,
   SafeSet,
 } = primordials;
 
@@ -31,10 +30,11 @@ const {
 const {
   emitExperimentalWarning,
   lazyDOMException,
+  promisify,
 } = require('internal/util');
 
 const {
-  generateKeyPair,
+  generateKeyPair: _generateKeyPair,
 } = require('internal/crypto/keygen');
 
 const {
@@ -45,6 +45,8 @@ const {
   create