diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2019-07-21 20:14:34 +0200 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-07-23 21:17:19 -0700 |
| commit | 1dc458cdd0a578093d5e84439158c799664b78cf (patch) | |
| tree | 9d919b307df1ff952e46484acf0aa14ea6adc4be /lib | |
| parent | bd3b85bf89df16515ad79b537da02b8a6d3fba55 (diff) | |
| download | android-node-v8-1dc458cdd0a578093d5e84439158c799664b78cf.tar.gz android-node-v8-1dc458cdd0a578093d5e84439158c799664b78cf.tar.bz2 android-node-v8-1dc458cdd0a578093d5e84439158c799664b78cf.zip | |
crypto: increase maxmem range from 32 to 53 bits
Fixes: https://github.com/nodejs/node/issues/28755
PR-URL: https://github.com/nodejs/node/pull/28799
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/internal/crypto/scrypt.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js index 50a2bbc153..2705611832 100644 --- a/lib/internal/crypto/scrypt.js +++ b/lib/internal/crypto/scrypt.js @@ -3,11 +3,11 @@ 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, - ERR_INVALID_CALLBACK, + ERR_INVALID_CALLBACK } = require('internal/errors').codes; const { getDefaultEncoding, @@ -107,8 +107,8 @@ function check(password, salt, keylen, options) { p = options.parallelization; } if (options.maxmem !== undefined) { - validateUint32(options.maxmem, 'maxmem'); maxmem = options.maxmem; + validateInteger(maxmem, 'maxmem', 0); } if (N === 0) N = defaults.N; if (r === 0) r = defaults.r; |