Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/app/services/encryptservice.js

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the hint.
I'll keep an eye on this. Just changing the numbers here would most likely break the app right now. Not the encryption itself, but the app logic. I'll figure out how the other project depending apps and libs are handling this right now before touching anything here.

Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
// AngularJS will instantiate a singleton by calling "new" on this function
var encryption_config = {
adata: "",
iter: 1000,
iter: 100000,
ks: 256,
mode: 'ccm',
ts: 64
ts: 128
};

return {
Expand Down
8 changes: 7 additions & 1 deletion js/app/services/settingsservice.js

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, setting a default vault with optional auto login is a "feature" and requires the vault password to be stored in defaultVaultPass. Not sure who would use that, but it's basically intended behaviour.
I am sure your changes here would break that.

Image

So please explain the reason for the changes here, or remove them.

Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
});

var cookie = localStorageService.get('settings');
if (cookie && cookie.defaultVaultPass !== undefined) {
delete cookie.defaultVaultPass;
}
settings = angular.merge(settings, cookie);
return {
getSettings: function () {
Expand All @@ -55,8 +58,11 @@
return settings[name];
},
setSetting: function (name, value) {
var storedSettings;
settings[name] = value;
localStorageService.set('settings', settings);
storedSettings = angular.copy(settings);
delete storedSettings.defaultVaultPass;
localStorageService.set('settings', storedSettings);
},
isEnabled: function (name) {
return settings[name] === 1 || settings[name] === '1';
Expand Down