crypto: simplify webcrypto ECDH deriveBits

PR-URL: #44946
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>

Author: panva

lib/internal/crypto/diffiehellman.js

@@ -2,10 +2,8 @@
 
 const{
  ArrayBufferPrototypeSlice,
- FunctionPrototypeCall,
  MathCeil,
  ObjectDefineProperty,
- Promise,
  SafeSet,
 }=primordials;
 
@@ -33,7 +31,6 @@ const {
 }=require('internal/errors');
 
 const{
- validateFunction,
  validateInt32,
  validateObject,
  validateString,
@@ -57,6 +54,7 @@ const {
 const{
  getArrayBufferOrView,
  getDefaultEncoding,
+ jobPromise,
  toBuf,
  kHandle,
  kKeyObject,
@@ -317,22 +315,9 @@ function diffieHellman(options) {
 returnstatelessDH(privateKey[kHandle],publicKey[kHandle]);
 }
 
-// The deriveBitsECDH function is part of the Web Crypto API and serves both
+// The ecdhDeriveBits function is part of the Web Crypto API and serves both
 // deriveKeys and deriveBits functions.
-functionderiveBitsECDH(name,publicKey,privateKey,callback){
-validateString(name,'name');
-validateObject(publicKey,'publicKey');
-validateObject(privateKey,'privateKey');
-validateFunction(callback,'callback');
-constjob=newECDHBitsJob(kCryptoJobAsync,name,publicKey,privateKey);
-job.ondone=(error,bits)=>{
-if(error)returnFunctionPrototypeCall(callback,job,error);
-FunctionPrototypeCall(callback,job,null,bits);
-};
-job.run();
-}
-
-asyncfunctionasyncDeriveBitsECDH(algorithm,baseKey,length){
+asyncfunctionecdhDeriveBits(algorithm,baseKey,length){
 const{'public': key}=algorithm;
 
 // Null means that we're not asking for a specific number of bits, just
@@ -372,15 +357,11 @@ async function asyncDeriveBitsECDH(algorithm, baseKey, length) {
 throwlazyDOMException('Named curve mismatch','InvalidAccessError');
 }
 
-constbits=awaitnewPromise((resolve,reject)=>{
-deriveBitsECDH(
-key.algorithm.name==='ECDH' ? baseKey.algorithm.namedCurve : baseKey.algorithm.name,
-key[kKeyObject][kHandle],
-baseKey[kKeyObject][kHandle],(err,bits)=>{
-if(err)returnreject(err);
-resolve(bits);
-});
-});
+constbits=awaitjobPromise(newECDHBitsJob(
+kCryptoJobAsync,
+key.algorithm.name==='ECDH' ? baseKey.algorithm.namedCurve : baseKey.algorithm.name,
+key[kKeyObject][kHandle],
+baseKey[kKeyObject][kHandle]));
 
 // If a length is not specified, return the full derived secret
 if(length===null)
@@ -407,6 +388,5 @@ module.exports = {
  DiffieHellmanGroup,
 ECDH,
  diffieHellman,
- deriveBitsECDH,
- asyncDeriveBitsECDH,
+ ecdhDeriveBits,
 };

lib/internal/crypto/webcrypto.js

@@ -177,7 +177,7 @@ async function deriveBits(algorithm, baseKey, length) {
 // Fall through
 case'ECDH':
 returnlazyRequire('internal/crypto/diffiehellman')
-.asyncDeriveBitsECDH(algorithm,baseKey,length);
+.ecdhDeriveBits(algorithm,baseKey,length);
 case'HKDF':
 returnlazyRequire('internal/crypto/hkdf')
 .hkdfDeriveBits(algorithm,baseKey,length);
@@ -256,7 +256,7 @@ async function deriveKey(
 // Fall through
 case'ECDH':
 bits=awaitlazyRequire('internal/crypto/diffiehellman')
-.asyncDeriveBitsECDH(algorithm,baseKey,length);
+.ecdhDeriveBits(algorithm,baseKey,length);
 break;
 case'HKDF':
 bits=awaitlazyRequire('internal/crypto/hkdf')