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

fixes #importWallet

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-10-27 17:23:01 -03:00
commit 8183a1d3c7
3 changed files with 71 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
js/util/crypto.js
View file

@ -5,21 +5,25 @@ var sjcl = require('../../lib/sjcl');
var log = require('../log.js');
var _ = require('lodash');
var SALT = 'copay random string NWRlNmExMTE4NzIzYzYyYWMwODU1MTdkN';
var SEPARATOR = '&';
var defaultOptions = {
adata: '',
cipher: 'aes',
ks: 128,
iter: 2000,
mode: 'ccm',
ts: 64
};
var defaultSalt = 'mjuBtGybi/4=';
var defaultIterations = 100;
// var SEPARATOR = '&';
// var defaultOptions = {
// adata: '',
// cipher: 'aes',
// ks: 128,
// iter: 2000,
// mode: 'ccm',
// ts: 64
// };
module.exports = {
kdf: function(value1, value2) {
return sjcl.codec.base64.fromBits(sjcl.misc.pbkdf2(value1 + value2, SALT));
kdf: function(value1, value2, salt, iterations) {
iterations = iterations || defaultIterations;
salt = salt || defaultSalt;
return sjcl.codec.base64.fromBits(sjcl.misc.pbkdf2(value1 + (value2 || ''), salt, iterations));
},
/**
@ -35,10 +39,10 @@ module.exports = {
/**
* Decrypts symmetrically using a passphrase
*/
decrypt: function(key, cypher) {
decrypt: function(key, cyphertext) {
var output = {};
try {
return sjcl.decrypt(key, cypher);
return sjcl.decrypt(key, cyphertext);
} catch (e) {
log.error('Decryption failed due to error: ' + e.message);
return null;