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

output kdf params

This commit is contained in:
antelle 2017-01-30 23:21:07 +01:00
parent a14b322752
commit 4ed8da4d2f
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,8 +48,8 @@ var FileModel = Backbone.Model.extend({
open: function(password, fileData, keyFileData, callback) {
try {
var credentials = new kdbxweb.Credentials(password, keyFileData);
var ts = logger.ts();
let credentials = new kdbxweb.Credentials(password, keyFileData);
let ts = logger.ts();
kdbxweb.Kdbx.load(fileData, credentials)
.then(db => {
@ -59,8 +59,23 @@ var FileModel = Backbone.Model.extend({
if (keyFileData) {
kdbxweb.ByteUtils.zeroBuffer(keyFileData);
}
let kdfParams = '';
if (db.header.kdfParameters) {
kdfParams = db.header.kdfParameters.keys().map(key => {
let val = db.header.kdfParameters.get(key);
if (val instanceof ArrayBuffer) {
return;
}
if (val.value) {
val = val.value;
}
return key + '=' + val;
}).filter(p => p).join('&');
} else if (db.header.keyEncryptionRounds) {
kdfParams = db.header.keyEncryptionRounds + ' rounds';
}
logger.info('Opened file ' + this.get('name') + ': ' + logger.ts(ts) + ', ' +
db.header.keyEncryptionRounds + ' rounds, ' + Math.round(fileData.byteLength / 1024) + ' kB');
kdfParams + ', ' + Math.round(fileData.byteLength / 1024) + ' kB');
callback();
})
.catch(err => {

2
bower.json
View File

@ -27,7 +27,7 @@
"bourbon": "4.2.7",
"dropbox": "keeweb/dropbox-js#0ac0efdc2711eece73f6ac044459e1fd0d5e9390",
"font-awesome": "4.6.3",
"kdbxweb": "ce34b29325a67667c945d8abfffed7d00e8773a7",
"kdbxweb": "c44761da37d41c799ece04799e3c164cfa79804c",
"normalize.css": "4.2.0",
"pikaday": "1.4.0",
"FileSaver.js": "eligrey/FileSaver.js",