test: refactor test-crypto-pbkdf2

PR-URL: #35693
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: tniessen

test/parallel/test-crypto-pbkdf2.js

@@ -6,19 +6,26 @@ if (!common.hasCrypto)
 constassert=require('assert');
 constcrypto=require('crypto');
 
-//
-// Test PBKDF2 with RFC 6070 test vectors (except #4)
-//
-functiontestPBKDF2(password,salt,iterations,keylen,expected){
-constactual=
-crypto.pbkdf2Sync(password,salt,iterations,keylen,'sha256');
-assert.strictEqual(actual.toString('latin1'),expected);
+functionrunPBKDF2(password,salt,iterations,keylen,hash){
+constsyncResult=
+crypto.pbkdf2Sync(password,salt,iterations,keylen,hash);
 
-crypto.pbkdf2(password,salt,iterations,keylen,'sha256',(err,actual)=>{
-assert.strictEqual(actual.toString('latin1'),expected);
-});
+crypto.pbkdf2(password,salt,iterations,keylen,hash,
+common.mustSucceed((asyncResult)=>{
+assert.deepStrictEqual(asyncResult,syncResult);
+}));
+
+returnsyncResult;
+}
+
+functiontestPBKDF2(password,salt,iterations,keylen,expected,encoding){
+constactual=runPBKDF2(password,salt,iterations,keylen,'sha256');
+assert.strictEqual(actual.toString(encoding||'latin1'),expected);
 }
 
+//
+// Test PBKDF2 with RFC 6070 test vectors (except #4)
+//
 
 testPBKDF2('password','salt',1,20,
 '\x12\x0f\xb6\xcf\xfc\xf8\xb3\x2c\x43\xe7\x22\x52'+
@@ -43,15 +50,9 @@ testPBKDF2('pass\0word', 'sa\0lt', 4096, 16,
 '\x89\xb6\x9d\x05\x16\xf8\x29\x89\x3c\x69\x62\x26\x65'+
 '\x0a\x86\x87');
 
-constexpected=
-'64c486c55d30d4c5a079b8823b7d7cb37ff0556f537da8410233bcec330ed956';
-constkey=crypto.pbkdf2Sync('password','salt',32,32,'sha256');
-assert.strictEqual(key.toString('hex'),expected);
-
-crypto.pbkdf2('password','salt',32,32,'sha256',common.mustSucceed(ondone));
-functionondone(key){
-assert.strictEqual(key.toString('hex'),expected);
-}
+testPBKDF2('password','salt',32,32,
+'64c486c55d30d4c5a079b8823b7d7cb37ff0556f537da8410233bcec330ed956',
+'hex');
 
 // Error path should not leak memory (check with valgrind).
 assert.throws(
@@ -197,38 +198,12 @@ assert.throws(
 );
 });
 
-// Any TypedArray should work for password and salt
-crypto.pbkdf2(newUint8Array(10),'salt',8,8,'sha256',common.mustSucceed());
-crypto.pbkdf2('pass',newUint8Array(10),8,8,'sha256',common.mustSucceed());
-crypto.pbkdf2(newUint16Array(10),'salt',8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2('pass',newUint16Array(10),8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2(newUint32Array(10),'salt',8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2('pass',newUint32Array(10),8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2(newFloat32Array(10),'salt',8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2('pass',newFloat32Array(10),8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2(newFloat64Array(10),'salt',8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2('pass',newFloat64Array(10),8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2(newArrayBuffer(10),'salt',8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2('pass',newArrayBuffer(10),8,8,'sha1',common.mustSucceed());
-crypto.pbkdf2(newSharedArrayBuffer(10),'salt',8,8,'sha256',
-common.mustSucceed());
-crypto.pbkdf2('pass',newSharedArrayBuffer(10),8,8,'sha256',
-common.mustSucceed());
-
-crypto.pbkdf2Sync(newUint8Array(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newUint8Array(10),8,8,'sha256');
-crypto.pbkdf2Sync(newUint16Array(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newUint16Array(10),8,8,'sha256');
-crypto.pbkdf2Sync(newUint32Array(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newUint32Array(10),8,8,'sha256');
-crypto.pbkdf2Sync(newFloat32Array(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newFloat32Array(10),8,8,'sha256');
-crypto.pbkdf2Sync(newFloat64Array(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newFloat64Array(10),8,8,'sha256');
-crypto.pbkdf2Sync(newArrayBuffer(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newArrayBuffer(10),8,8,'sha256');
-crypto.pbkdf2Sync(newSharedArrayBuffer(10),'salt',8,8,'sha256');
-crypto.pbkdf2Sync('pass',newSharedArrayBuffer(10),8,8,'sha256');
+// Any TypedArray should work for password and salt.
+for(constSomeArrayof[Uint8Array,Uint16Array,Uint32Array,Float32Array,
+Float64Array,ArrayBuffer,SharedArrayBuffer]){
+runPBKDF2(newSomeArray(10),'salt',8,8,'sha256');
+runPBKDF2('pass',newSomeArray(10),8,8,'sha256');
+}
 
 assert.throws(
 ()=>crypto.pbkdf2('pass','salt',8,8,'md55',common.mustNotCall()),
@@ -252,6 +227,5 @@ const kNotPBKDF2Supported = ['shake128', 'shake256'];
 crypto.getHashes()
 .filter((hash)=>!kNotPBKDF2Supported.includes(hash))
 .forEach((hash)=>{
-crypto.pbkdf2Sync(newUint8Array(10),'salt',8,8,hash);
-crypto.pbkdf2(newUint8Array(10),'salt',8,8,hash,common.mustCall());
+runPBKDF2(newUint8Array(10),'salt',8,8,hash);
 });