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

Merge pull request #3411 from matiu/ref/rm-uuid-encryption 

do not encrypt profiles in mobile
This commit is contained in:
Gustavo Maximiliano Cortez 2015-11-09 09:18:24 -03:00
parent 178efda594 8e20c194d4
commit 55668d1b90
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/js/services/storageService.js
View File

@ -25,13 +25,17 @@ angular.module('copayApp.services')
};
var encryptOnMobile = function(text, cb) {
getUUID(function(uuid) {
if (uuid) {
$log.debug('Encrypting profile');
text = sjcl.encrypt(uuid, text);
}
return cb(null, text);
});
// UUID encryption is disabled.
return cb(null, text);
//
// getUUID(function(uuid) {
// if (uuid) {
// $log.debug('Encrypting profile');
// text = sjcl.encrypt(uuid, text);
// }
// return cb(null, text);
// });
};
@ -43,8 +47,10 @@ angular.module('copayApp.services')
if (!json) return cb('Could not access storage')
if (!json.iter || !json.ct)
if (!json.iter || !json.ct) {
$log.debug('Profile is not encrypted');
return cb(null, text);
}
$log.debug('Profile is encrypted');
getUUID(function(uuid) {
@ -54,6 +60,11 @@ angular.module('copayApp.services')
try {
text = sjcl.decrypt(uuid, text);
$log.info('Migrating to unencrypted profile');
return storage.set('profile', text, function(err) {
return cb(err, text);
});
} catch(e) {
$log.warn('Decrypt error: ', e);
return cb('Could not decrypt storage: device ID mismatch');
@ -111,7 +122,6 @@ angular.module('copayApp.services')
storage.get('profile', function(err, str) {
if (err || !str)
// Migrate ?
return cb(err);
decryptOnMobile(str, function(err, str) {
@ -120,6 +130,7 @@ angular.module('copayApp.services')
try {
p = Profile.fromString(str);
} catch (e) {
$log.debug('Could not read profile:', e);
err = new Error('Could not read profile:' + p);
}
return cb(err, p);