crypto: DRY type checking

Factor out some common code. The `checkUint()` function will also be used in a follow-up commit that adds scrypt support to core. PR-URL: #20816 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>

Author: bnoordhuis

lib/internal/crypto/pbkdf2.js

@@ -4,19 +4,15 @@ const{
 ERR_INVALID_ARG_TYPE,
 ERR_INVALID_CALLBACK,
 ERR_CRYPTO_INVALID_DIGEST,
-ERR_OUT_OF_RANGE
 }=require('internal/errors').codes;
 const{
  checkIsArrayBufferView,
+ checkIsUint,
  getDefaultEncoding,
- toBuf
 }=require('internal/crypto/util');
 const{
 PBKDF2
 }=process.binding('crypto');
-const{
-INT_MAX
-}=process.binding('constants').crypto;
 
 functionpbkdf2(password,salt,iterations,keylen,digest,callback){
 if(typeofdigest==='function'){
@@ -39,22 +35,12 @@ function _pbkdf2(password, salt, iterations, keylen, digest, callback){
 if(digest!==null&&typeofdigest!=='string')
 thrownewERR_INVALID_ARG_TYPE('digest',['string','null'],digest);
 
-password=checkIsArrayBufferView('password',toBuf(password));
-salt=checkIsArrayBufferView('salt',toBuf(salt));
-
-if(typeofiterations!=='number')
-thrownewERR_INVALID_ARG_TYPE('iterations','number',iterations);
-
-if(iterations<0)
-thrownewERR_OUT_OF_RANGE('iterations',
-'a non-negative number',
-iterations);
-
-if(typeofkeylen!=='number')
-thrownewERR_INVALID_ARG_TYPE('keylen','number',keylen);
-
-if(keylen<0||!Number.isInteger(keylen)||keylen>INT_MAX)
-thrownewERR_OUT_OF_RANGE('keylen',`>= 0 && <= ${INT_MAX}`,keylen);
+password=checkIsArrayBufferView('password',password);
+salt=checkIsArrayBufferView('salt',salt);
+// FIXME(bnoordhuis) The error message is in fact wrong since |iterations|
+// cannot be > INT_MAX. Adjust in the next major release.
+iterations=checkIsUint('iterations',iterations,'a non-negative number');
+keylen=checkIsUint('keylen',keylen);
 
 constencoding=getDefaultEncoding();
 

lib/internal/crypto/sig.js

@@ -77,7 +77,7 @@ Sign.prototype.sign = function sign(options, encoding){
 
 varpssSaltLength=getSaltLength(options);
 
-key=checkIsArrayBufferView('key',toBuf(key));
+key=checkIsArrayBufferView('key',key);
 
 varret=this._handle.sign(key,passphrase,rsaPadding,pssSaltLength);
 
@@ -114,7 +114,7 @@ Verify.prototype.verify = function verify(options, signature, sigEncoding){
 
 varpssSaltLength=getSaltLength(options);
 
-key=checkIsArrayBufferView('key',toBuf(key));
+key=checkIsArrayBufferView('key',key);
 
 signature=checkIsArrayBufferView('signature',
 toBuf(signature,sigEncoding));

lib/internal/crypto/util.js

@@ -15,7 +15,8 @@ const{
 const{
 ERR_CRYPTO_ENGINE_UNKNOWN,
 ERR_CRYPTO_TIMING_SAFE_EQUAL_LENGTH,
-ERR_INVALID_ARG_TYPE
+ERR_INVALID_ARG_TYPE,
+ERR_OUT_OF_RANGE,
 }=require('internal/errors').codes;
 const{ Buffer }=require('buffer');
 const{
@@ -25,6 +26,9 @@ const{
 const{
  isArrayBufferView
 }=require('internal/util/types');
+const{
+INT_MAX
+}=process.binding('constants').crypto;
 
 vardefaultEncoding='buffer';
 
@@ -84,6 +88,7 @@ function timingSafeEqual(buf1, buf2){
 }
 
 functioncheckIsArrayBufferView(name,buffer){
+buffer=toBuf(buffer);
 if(!isArrayBufferView(buffer)){
 thrownewERR_INVALID_ARG_TYPE(
 name,
@@ -94,8 +99,19 @@ function checkIsArrayBufferView(name, buffer){
 returnbuffer;
 }
 
+functioncheckIsUint(name,value,errmsg=`>= 0 && <= ${INT_MAX}`){
+if(typeofvalue!=='number')
+thrownewERR_INVALID_ARG_TYPE(name,'number',value);
+
+if(value<0||!Number.isInteger(value)||value>INT_MAX)
+thrownewERR_OUT_OF_RANGE(name,errmsg,value);
+
+returnvalue;
+}
+
 module.exports={
  checkIsArrayBufferView,
+ checkIsUint,
  getCiphers,
  getCurves,
  getDefaultEncoding,