mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-20 02:11:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correction d'un conflit de PR

Browse Source 
Conflit avec le commit https://github.com/marienfressinaud/FreshRSS/commit/7a510af73a0ef04ce09fb7eedd98c844e7bff51c
This commit is contained in:
Amaury Carrade committed 2014-01-26 21:36:42 +01:00
1 parent 0a1a781609
commit 19eefd434c
1 file changed
+13 -9
Download Patch File Download Diff File Expand all files Collapse all files
p/scripts/main.js
+13 -9
View File
@@ -643,15 +643,19 @@ 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() {
alert('Communication error!');