add more checks for keylen

browserify · Feb 24, 2016 · f64f48d · f64f48d
1 parent 14dbae5
commit f64f48d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/browser.js b/browser.js
@@ -21,7 +21,7 @@ function pbkdf2 (password, salt, iterations, keylen, digest, callback) {
   })
 }
 
-function checkParameters(iterations, keylen) {
+function checkParameters (iterations, keylen) {
   if (typeof iterations !== 'number') {
     throw new TypeError('Iterations not a number')
   }
@@ -34,7 +34,7 @@ function checkParameters(iterations, keylen) {
     throw new TypeError('Key length not a number')
   }
 
-  if (keylen < 0 || keylen > MAX_ALLOC) {
+  if (keylen < 0 || keylen > MAX_ALLOC || isNaN(keylen)) {
     throw new TypeError('Bad key length')
   }
 }

diff --git a/index.js b/index.js
@@ -18,7 +18,7 @@ function asyncPBKDF2 (password, salt, iterations, keylen, digest, callback) {
     throw new TypeError('Key length not a number')
   }
 
-  if (keylen < 0 || keylen > MAX_ALLOC) {
+  if (keylen < 0 || keylen > MAX_ALLOC || isNaN(keylen)) {
     throw new TypeError('Bad key length')
   }
 

diff --git a/test/fixtures.json b/test/fixtures.json
@@ -159,13 +159,6 @@
       "iterations": 1,
       "dkLen": -1,
       "exception": "Bad key length"
-    },
-    {
-      "key": "password",
-      "salt": "salt",
-      "iterations": 1,
-      "dkLen": 4073741824,
-      "exception": "Bad key length"
     }
   ]
 }
diff --git a/test/index.js b/test/index.js
@@ -3,6 +3,20 @@ var compatNode = require('../')
 var compatBrowser = require('../browser')
 var fixtures = require('./fixtures')
 
+fixtures.invalid.push({
+  "key": "password",
+  "salt": "salt",
+  "iterations": 1,
+  "dkLen": NaN,
+  "exception": "Bad key length"
+}, {
+  "key": "password",
+  "salt": "salt",
+  "iterations": 1,
+  "dkLen": Infinity,
+  "exception": "Bad key length"
+})
+
 // SHA-1 vectors generated by Node.js
 // SHA-256/SHA-512 test vectors from:
 // https://stackoverflow.com/questions/5130513/pbkdf2-hmac-sha2-test-vectors