Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: move _scrypt call out of handleError funct #28318

Closed
wants to merge 5 commits into from
Closed

crypto: move _scrypt call out of handleError funct #28318

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13b51d2
crypto: move _scrypt call out of handleError funct
danbev Jun 20, 2019
ec54953
fixup! crypto: move _scrypt call out of handleError funct
danbev Jun 20, 2019
3b3908d
crypto: move _randomBytes call out of handleError funct
danbev Jun 20, 2019
d96eff6
crypto: move _pbkdf2 call out of handleError funct
danbev Jun 20, 2019
247df3c
crypto: move _impl call out of handleError funct
danbev Jun 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions lib/internal/crypto/scrypt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,28 @@ function scrypt(password, salt, keylen, options, callback = defaults) {
callback.call(wrap, null, keybuf.toString(encoding));
};

handleError(keybuf, password, salt, N, r, p, maxmem, wrap);
handleError(_scrypt(keybuf, password, salt, N, r, p, maxmem, wrap));
}

function scryptSync(password, salt, keylen, options = defaults) {
options = check(password, salt, keylen, options);
const { N, r, p, maxmem } = options;
({ password, salt, keylen } = options);
const keybuf = Buffer.alloc(keylen);
handleError(keybuf, password, salt, N, r, p, maxmem);
handleError(_scrypt(keybuf, password, salt, N, r, p, maxmem));
const encoding = getDefaultEncoding();
if (encoding === 'buffer') return keybuf;
return keybuf.toString(encoding);
}

function handleError(keybuf, password, salt, N, r, p, maxmem, wrap) {
const ex = _scrypt(keybuf, password, salt, N, r, p, maxmem, wrap);

if (ex === undefined)
function handleError(error) {
danbev marked this conversation as resolved.
Show resolved Hide resolved
if (error === undefined)
return;

if (ex === null)
if (error === null)
throw new ERR_CRYPTO_SCRYPT_INVALID_PARAMETER(); // Bad N, r, p, or maxmem.

throw ex; // Scrypt operation failed, exception object contains details.
throw error; // Scrypt operation failed, exception object contains details.
}

function check(password, salt, keylen, options) {
Expand Down