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

Merge pull request #1930 from cmgustavo/feature/pin-01

Browse source 
PIN for mobile devices
This commit is contained in:
Matias Alejo Garcia 2014-12-03 23:56:10 -03:00
commit 6f1342ea27
21 changed files with 589 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/util/crypto.js
View file

@ -59,22 +59,22 @@ module.exports = {
/**
* Encrypts symmetrically using a passphrase
*/
encrypt: function(key, message) {
encrypt: function(key, message, salt, iter) {
if (!_.isString(message)) {
message = JSON.stringify(message);
}
sjcl.json.defaults.salt = defaultSalt;
sjcl.json.defaults.iter = defaultIterations;
sjcl.json.defaults.salt = salt || defaultSalt;
sjcl.json.defaults.iter = iter || defaultIterations;
return sjcl.encrypt(key, message);
},
/**
* Decrypts symmetrically using a passphrase
*/
decrypt: function(key, cyphertext) {
decrypt: function(key, sjclEncryptedJson) {
var output = {};
try {
return sjcl.decrypt(key, cyphertext);
return sjcl.decrypt(key, sjclEncryptedJson);
} catch (e) {
log.info('Decryption failed due to error: ' + e.message);
return null;