added digest argument to crypto.pbkdf2

- it's an optional argument that in node 6 became non-optional - also added 5th arg to mock Crypto.pbkdf2 in test
hapijs · Apr 29, 2016 · 9e0a1ef · 9e0a1ef
1 parent 674d056
commit 9e0a1ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -126,7 +126,7 @@ exports.generateKey = function (password, options, callback) {
 
     const generateKey = (salt) => {
 
-        Crypto.pbkdf2(password, salt, options.iterations, algorithm.keyBits / 8, (err, derivedKey) => {
+        Crypto.pbkdf2(password, salt, options.iterations, algorithm.keyBits / 8, 'sha1', (err, derivedKey) => {
 
             if (err) {
                 return callback(err);
@@ -416,4 +416,3 @@ exports.unseal = function (sealed, password, options, callback) {
         });
     });
 };
-
diff --git a/test/index.js b/test/index.js
@@ -275,7 +275,7 @@ describe('Iron', () => {
         it('returns an error when Crypto.pbkdf2 fails', (done) => {
 
             const orig = Crypto.pbkdf2;
-            Crypto.pbkdf2 = function (v1, v2, v3, v4, callback) {
+            Crypto.pbkdf2 = function (v1, v2, v3, v4, v5, callback) {
 
                 return callback(new Error('fake'));
             };