summaryrefslogtreecommitdiff
path: root/p/scripts/main.js
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-26 22:33:00 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-10-26 22:33:00 +0100
commit299495d0820dd6a8c26842264a3b15b95884b9fb (patch)
treee6fd4ae1379909afdc772f2d271c95f84743519c /p/scripts/main.js
parent482f995d61f4b172f7b79becc25d0d7157098daf (diff)
Crypto update bcrypt.js + bug
https://github.com/marienfressinaud/FreshRSS/issues/676
Diffstat (limited to 'p/scripts/main.js')
-rw-r--r--p/scripts/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js
index b6370866f..dc5428048 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -1014,7 +1014,7 @@ function init_crypto_form() {
try {
var strong = window.Uint32Array && window.crypto && (typeof window.crypto.getRandomValues === 'function'),
s = dcodeIO.bcrypt.hashSync($('#passwordPlain').val(), data.salt1),
- c = dcodeIO.bcrypt.hashSync(data.nonce + s, strong ? 4 : poormanSalt());
+ c = dcodeIO.bcrypt.hashSync(data.nonce + s, strong ? dcodeIO.bcrypt.genSaltSync(4) : poormanSalt());
$('#challenge').val(c);
if (s == '' || c == '') {
openNotification('Crypto error!', 'bad');