keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed file open bug

This commit is contained in:
Antelle 2015-11-06 23:30:36 +03:00
parent 2c1da0dc04
commit 9fd0ebd8a4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.jshintrc
View File

@ -89,6 +89,7 @@
"require": true,
"module": true,
"console": true,
"performance": true,
"$": true,
"_": true
}

7
app/scripts/models/file-model.js
View File

@ -51,6 +51,7 @@ var FileModel = Backbone.Model.extend({
password = new kdbxweb.ProtectedValue(value.buffer.slice(0, byteLength), salt.buffer.slice(0, byteLength));
try {
var credentials = new kdbxweb.Credentials(password, keyFileData);
var start = performance.now();
kdbxweb.Kdbx.load(fileData, credentials, (function(db, err) {
if (err) {
this.set({error: true, opening: false});
@ -59,7 +60,11 @@ var FileModel = Backbone.Model.extend({
this.db = db;
this.readModel(this.get('name'));
this.setOpenFile({ passwordLength: len });
kdbxweb.ByteUtils.zeroBuffer(keyFileData);
if (keyFileData) {
kdbxweb.ByteUtils.zeroBuffer(keyFileData);
}
console.log('Opened file ' + this.get('name') + ': ' + Math.round(performance.now() - start) + 'ms, ' +
db.header.keyEncryptionRounds + ' rounds, ' + Math.round(fileData.byteLength / 1024) + ' kB');
}
}).bind(this));
} catch (e) {