anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fixed import profile and wallets

Browse source
This commit is contained in:
Matias Pando 2014-11-07 17:35:32 -03:00
commit 73088bca2b
10 changed files with 37 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/util/crypto.js
View file

@ -4,9 +4,10 @@
var sjcl = require('sjcl');
var log = require('../log.js');
var _ = require('lodash');
var config = require('../../config');
var defaultSalt = 'mjuBtGybi/4=';
var defaultIterations = 100;
var defaultSalt = (config && config.passphraseConfig && config.passphraseConfig.storageSalt) || 'mjuBtGybi/4=';
var defaultIterations = (config && config.passphraseConfig && config.passphraseConfig.iterations) || 1000;
module.exports = {
@ -50,6 +51,8 @@ module.exports = {
if (!_.isString(message)) {
message = JSON.stringify(message);
}
sjcl.json.defaults.salt = defaultSalt;
sjcl.json.defaults.iter = defaultIterations;
return sjcl.encrypt(key, message);
},