diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-26 19:06:42 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-01-26 19:06:42 +0100 |
| commit | 7a510af73a0ef04ce09fb7eedd98c844e7bff51c (patch) | |
| tree | 193063e9988ebaeff8750b7be29f7e8f30809bf9 /p/scripts | |
| parent | 1031c19779d4cd6764dab6fbc8360cc99ff83409 (diff) | |
Compatibilité bcrypt.js oubliée
Corrige https://github.com/marienfressinaud/FreshRSS/issues/396
+ Ajoute de meilleurs messages d'erreur
Diffstat (limited to 'p/scripts')
| -rw-r--r-- | p/scripts/main.js | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js index d891299a8..d775b3a20 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -626,14 +626,18 @@ function init_loginForm() { if (data.salt1 == '' || data.nonce == '') { alert('Invalid user!'); } else { - 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()); - $('#challenge').val(c); - if (s == '' || c == '') { - alert('Crypto error!'); - } else { - success = true; + 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()); + $('#challenge').val(c); + if (s == '' || c == '') { + alert('Crypto error!'); + } else { + success = true; + } + } catch (e) { + alert('Crypto exception! ' + e); } } }).fail(function() { |