Skip to content

crypto: increase maxmem range from 32 to 53 bits #28799

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

Closed
tniessen wants to merge 4 commits into from
+28 −6
Closed

crypto: increase maxmem range from 32 to 53 bits #28799

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef735d6
crypto: increase maxmem range from 32 to 53 bits
tniessen Jul 21, 2019
c37e0fc
fixup! crypto: increase maxmem range from 32 to 53 bits
tniessen Jul 22, 2019
e9cb4ec
fixup! crypto: increase maxmem range from 32 to 53 bits
tniessen Jul 22, 2019
2f5401a
fixup! crypto: increase maxmem range from 32 to 53 bits
tniessen Jul 23, 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
Prev Previous commit
Next Next commit
fixup! crypto: increase maxmem range from 32 to 53 bits
  • Loading branch information
@tniessen
tniessen committed Jul 22, 2019
commit e9cb4ec34bc8423a718dccd44e0e292a11b21871
9 changes: 2 additions & 7 deletions lib/internal/crypto/scrypt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { Number } = primordials;
const { AsyncWrap, Providers } = internalBinding('async_wrap');
const { Buffer } = require('buffer');
const { scrypt: _scrypt } = internalBinding('crypto');
const { validateUint32 } = require('internal/validators');
const { validateInteger, validateUint32 } = require('internal/validators');
const {
ERR_CRYPTO_SCRYPT_INVALID_PARAMETER,
ERR_CRYPTO_SCRYPT_NOT_SUPPORTED,
Expand Down Expand Up @@ -111,12 +111,7 @@ function check(password, salt, keylen, options) {
}
if (options.maxmem !== undefined) {
maxmem = options.maxmem;
if (typeof maxmem !== 'number')
throw new ERR_INVALID_ARG_TYPE('maxmem', 'number', maxmem);
if (!Number.isInteger(maxmem))
throw new ERR_OUT_OF_RANGE('maxmem', 'an integer', maxmem);
if (maxmem < 0 || maxmem > Number.MAX_SAFE_INTEGER)
throw new ERR_OUT_OF_RANGE('maxmem', `>= 0 && < ${2 ** 53}`, maxmem);
validateInteger(maxmem, 'maxmem', 0);
}
if (N === 0) N = defaults.N;
if (r === 0) r = defaults.r;
Expand Down