1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: move _pbkdf2 call out of handleError funct

Browse Source 
This commit moves the _pbkdf2 function call out of the handleError
function, which now only takes in an error and a digest object as
its parameters.

PR-URL: https://github.com/nodejs/node/pull/28318
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Daniel Bevenius 2019-06-20 08:09:17 +02:00
parent 556b38ab0a
commit 7edd5f3bdd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/internal/crypto/pbkdf2.js
View File

@ -38,14 +38,15 @@ function pbkdf2(password, salt, iterations, keylen, digest, callback) {
callback.call(wrap, null, keybuf.toString(encoding)); callback.call(wrap, null, keybuf.toString(encoding));
}; };
handleError(keybuf, password, salt, iterations, digest, wrap); handleError(_pbkdf2(keybuf, password, salt, iterations, digest, wrap),
digest);
} }
function pbkdf2Sync(password, salt, iterations, keylen, digest) { function pbkdf2Sync(password, salt, iterations, keylen, digest) {
({ password, salt, iterations, keylen, digest } = ({ password, salt, iterations, keylen, digest } =
check(password, salt, iterations, keylen, digest)); check(password, salt, iterations, keylen, digest));
const keybuf = Buffer.alloc(keylen); const keybuf = Buffer.alloc(keylen);
handleError(keybuf, password, salt, iterations, digest); handleError(_pbkdf2(keybuf, password, salt, iterations, digest), digest);
const encoding = getDefaultEncoding(); const encoding = getDefaultEncoding();
if (encoding === 'buffer') return keybuf; if (encoding === 'buffer') return keybuf;
return keybuf.toString(encoding); return keybuf.toString(encoding);
@ -71,9 +72,7 @@ function check(password, salt, iterations, keylen, digest) {
return { password, salt, iterations, keylen, digest }; return { password, salt, iterations, keylen, digest };
} }
function handleError(keybuf, password, salt, iterations, digest, wrap) { function handleError(rc, digest) {
const rc = _pbkdf2(keybuf, password, salt, iterations, digest, wrap);
if (rc === -1) if (rc === -1)
throw new ERR_CRYPTO_INVALID_DIGEST(digest); throw new ERR_CRYPTO_INVALID_DIGEST(digest);