Updated PBKDF2PasswordHasher.

kalvish21 · Aug 24, 2018 · 650f6cb · 650f6cb
1 parent 584faaa
commit 650f6cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 44 deletions.
diff --git a/index.js b/index.js
@@ -102,13 +102,17 @@ module.exports.PBKDF2PasswordHasher = function() {
         var self = this;
         return new Promise(function (resolve, reject) {
             var salt = self.salt();
-            var key = pbkdf2(password, salt, self.iterations, self.len).toString('base64');
-            resolve(self.algorithm + "$" + self.iterations + "$" + salt + "$" + key);
+            crypto.pbkdf2(password, salt, self.iterations, self.len, 'sha256', function (err, derivedKey) {
+                if (err) { return reject(err); }
+                const key = new Buffer(derivedKey, 'binary').toString('base64');
+                resolve(self.algorithm + "$" + self.iterations + "$" + salt + "$" + key);
+            });
         });
     }
 
     this.verify = function(password, hash_password) {
         var self = this;
+
         return new Promise(function (resolve, reject) {
             if (!hash_password) {
                 resolve(false);
@@ -119,53 +123,20 @@ module.exports.PBKDF2PasswordHasher = function() {
                 resolve(false);
             }
 
-            var iterations = parseInt(parts[1]);
-            var salt = parts[2];
-            var value = pbkdf2(password, salt, iterations, self.len).toString('base64');
-            return resolve(value === parts[3]);
+            const iterations = parseInt(parts[1]);
+            const salt = parts[2];
+            const value = parts[3];
+            crypto.pbkdf2(password, salt, iterations, self.len, 'sha256', function (err, derivedKey) {
+                if (err) { return reject(err); }
+                return resolve(new Buffer(derivedKey, 'binary').toString('base64') === value);
+            });
         });
     }
 
     this.mustUpdate = function(hash_password) {
         var parts = hash_password.split('$');
         return parseInt(parts[1]) !== this.iterations;
     }
-
-    // Below code is from node-pbkdf2
-    //
-    // https://www.npmjs.com/package/node-pbkdf2
-    function pbkdf2(key, salt, iterations, dkLen) {
-        var hLen = 32;
-        if (typeof key == 'string') key = new Buffer(key);
-        if (typeof salt == 'string') salt = new Buffer(salt);
-
-        var DK = new Buffer(dkLen);
-        var T = new Buffer(hLen);
-        var block1 = new Buffer(salt.length + 4);
-
-        var l = Math.ceil(dkLen / hLen);
-        var r = dkLen - (l - 1) * hLen;
-
-        salt.copy(block1, 0, 0, salt.length);
-        for (var i = 1; i <= l; i++) {
-            block1.writeUInt32BE(i, salt.length);
-            var U = crypto.createHmac('sha256', key).update(block1).digest();
-            U.copy(T, 0, 0, hLen);
-
-            for (var j = 1; j < iterations; j++) {
-                U = crypto.createHmac('sha256', key).update(U).digest();
-                for (var k = 0; k < hLen; k++) {
-                    T[k] ^= U[k];
-                }
-            }
-
-            var destPos = (i - 1) * hLen;
-            var len = (i == l ? r : hLen);
-            T.copy(DK, destPos, 0, len);
-        }
-
-        return DK;
-    }
 }
 
 

diff --git a/package.json b/package.json
@@ -1,12 +1,11 @@
 {
   "name": "node-django-hashers",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "dependencies": {
     "argon2-ffi": "^1.1.0",
     "assert": "^1.4.1",
     "bcryptjs": "^2.3.0",
     "bluebird": "^3.5.1",
-    "crypto": "^0.0.3",
     "node-gyp": "^3.7.0"
   },
   "description": "All password hashing algorithms for Django implemented in javascript for nodejs projects.",