aboutsummaryrefslogtreecommitdiff
path: root/node_modules/pbkdf2/lib/sync.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-09-20 02:56:13 +0200
committerFlorian Dold <florian.dold@gmail.com>2018-09-20 02:56:13 +0200
commitbbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch)
treec58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/pbkdf2/lib/sync.js
parent003fb34971cf63466184351b4db5f7c67df4f444 (diff)
update packages
Diffstat (limited to 'node_modules/pbkdf2/lib/sync.js')
-rw-r--r--node_modules/pbkdf2/lib/sync.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/pbkdf2/lib/sync.js b/node_modules/pbkdf2/lib/sync.js
index 67b2e543d..f691e31a6 100644
--- a/node_modules/pbkdf2/lib/sync.js
+++ b/node_modules/pbkdf2/lib/sync.js
@@ -15,10 +15,11 @@ var defaultEncoding = require('../lib/default-encoding')
var Buffer = require('safe-buffer').Buffer
function pbkdf2 (password, salt, iterations, keylen, digest) {
+ checkParameters(password, salt, iterations, keylen)
+
if (!Buffer.isBuffer(password)) password = Buffer.from(password, defaultEncoding)
if (!Buffer.isBuffer(salt)) salt = Buffer.from(salt, defaultEncoding)
- checkParameters(iterations, keylen)
digest = digest || 'sha1'
var DK = Buffer.allocUnsafe(keylen)