diff --git a/lib/bcrypt-compute.js b/lib/bcrypt-compute.js index a3bcec32e33252f1864598190b66bf8cfe9380bb..24f64de6170d5be319aaf1afb70989da1b408ae2 100644 --- a/lib/bcrypt-compute.js +++ b/lib/bcrypt-compute.js @@ -6,10 +6,10 @@ const bcrypt = require('bcrypt'); process.on('message', function(m) { if (m.op === 'encrypt') { - var r = bcrypt.encrypt_sync(m.pass, bcrypt.gen_salt_sync(m.factor)); + var r = bcrypt.hashSync(m.pass, bcrypt.genSaltSync(m.factor)); process.send({r:r}); } else if (m.op === 'compare') { - var r = bcrypt.compare_sync(m.pass, m.hash); + var r = bcrypt.compareSync(m.pass, m.hash); process.send({r:r}); } }); diff --git a/lib/bcrypt.js b/lib/bcrypt.js index d3ee871cfb9aa06c47b7f36ad3fa14cea607e1ca..a2c0f231df73c2cbc0ebf7d2980710a2645d2322 100644 --- a/lib/bcrypt.js +++ b/lib/bcrypt.js @@ -46,8 +46,8 @@ exports.compare = function(pass, hash, cb) { }) }; -exports.get_rounds = function(hash) { - return bcrypt.get_rounds(hash); +exports.get_rounds = exports.getRounds = function(hash) { + return bcrypt.getRounds(hash); }; exports.shutdown = function() { diff --git a/lib/wsapi/authenticate_user.js b/lib/wsapi/authenticate_user.js index 6c0d21db8c3e99a115d6874d1c9d2871a6c8c727..496b972b335f65c59c033e6bf08e68c2419f833e 100644 --- a/lib/wsapi/authenticate_user.js +++ b/lib/wsapi/authenticate_user.js @@ -72,7 +72,7 @@ exports.process = function(req, res) { // if the work factor has changed, update the hash here. issue #204 // NOTE: this runs asynchronously and will not delay the response - if (config.get('bcrypt_work_factor') != bcrypt.get_rounds(hash)) { + if (config.get('bcrypt_work_factor') != bcrypt.getRounds(hash)) { logger.info("updating bcrypted password for user " + uid); // this request must be forwarded to dbwriter, and we'll use the diff --git a/package.json b/package.json index 0f0506dae2542e3c56889a321c9be41395a2adc1..82327586b043930903d40e55d5e0d17f6e25c564 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "JSONSelect": "0.4.0", - "bcrypt": "0.4.1", + "bcrypt": "0.7.1", "compute-cluster": "0.0.6", "connect": "1.7.2", "convict": "0.0.6",