crypto: increase maxmem range from 32 to 53 bits

Fixes: #28755
PR-URL: #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>

Author: tniessen

doc/api/crypto.md

@@ -2587,6 +2587,9 @@ request.
 <!-- YAML
 added: v10.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/28799
+ description: The `maxmem` value can now be any safe integer.
  - version: v10.9.0
  pr-url: https://github.com/nodejs/node/pull/21525
  description: The `cost`, `blockSize` and `parallelization` option names
@@ -2641,6 +2644,9 @@ crypto.scrypt('secret', 'salt', 64, { N: 1024 }, (err, derivedKey) => {
 <!-- YAML
 added: v10.5.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/28799
+ description: The `maxmem` value can now be any safe integer.
  - version: v10.9.0
  pr-url: https://github.com/nodejs/node/pull/21525
  description: The `cost`, `blockSize` and `parallelization` option names

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;

src/node_crypto.cc

@@ -6015,7 +6015,7 @@ struct ScryptJob : public CryptoJob {
 uint32_t N;
 uint32_t r;
 uint32_t p;
-uint32_t maxmem;
+uint64_t maxmem;
  CryptoErrorVector errors;
 
 inlineexplicitScryptJob(Environment* env) : CryptoJob(env) {}
@@ -6070,7 +6070,7 @@ void Scrypt(const FunctionCallbackInfo<Value>& args) {
 CHECK(args[3]->IsUint32()); // N
 CHECK(args[4]->IsUint32()); // r
 CHECK(args[5]->IsUint32()); // p
-CHECK(args[6]->IsUint32()); // maxmem
+CHECK(args[6]->IsNumber()); // maxmem
 CHECK(args[7]->IsObject() || args[7]->IsUndefined()); // wrap object
  std::unique_ptr<ScryptJob> job(newScryptJob(env));
  job->keybuf_data = reinterpret_cast<unsignedchar*>(Buffer::Data(args[0]));
@@ -6080,7 +6080,8 @@ void Scrypt(const FunctionCallbackInfo<Value>& args) {
  job->N = args[3].As<Uint32>()->Value();
  job->r = args[4].As<Uint32>()->Value();
  job->p = args[5].As<Uint32>()->Value();
- job->maxmem = args[6].As<Uint32>()->Value();
+ Local<Context> ctx = env->isolate()->GetCurrentContext();
+ job->maxmem = static_cast<uint64_t>(args[6]->IntegerValue(ctx).ToChecked());
 if (!job->Validate()) {
 // EVP_PBE_scrypt() does not always put errors on the error stack
 // and therefore ToResult() may or may not return an exception

test/parallel/test-crypto-scrypt.js

@@ -220,3 +220,18 @@ for (const { args, expected } of badargs) {
 common.expectsError(()=>crypto.scrypt('','',42,{}),expected);
 common.expectsError(()=>crypto.scrypt('','',42,{},{}),expected);
 }
+
+{
+// Values for maxmem that do not fit in 32 bits but that are still safe
+// integers should be allowed.
+crypto.scrypt('','',4,{maxmem: 2**52},
+common.mustCall((err,actual)=>{
+assert.ifError(err);
+assert.strictEqual(actual.toString('hex'),'d72c87d0');
+}));
+
+// Values that exceed Number.isSafeInteger should not be allowed.
+common.expectsError(()=>crypto.scryptSync('','',0,{maxmem: 2**53}),{
+code: 'ERR_OUT_OF_RANGE'
+});
+}