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

fixes

This commit is contained in:
Matias Alejo Garcia 2014-12-13 19:47:24 -03:00
parent ad40641646
commit 7ac8914bf5
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/plugins/EncryptedInsightStorage.js
View File

@ -9,11 +9,6 @@ function EncryptedInsightStorage(config) {
}
inherits(EncryptedInsightStorage, InsightStorage);
EncryptedInsightStorage.prototype._brokenDecryptUndef = function(body) {
cryptoUtil.decrypt('undefined' + SEPARATOR + 'undefined', body);
};
EncryptedInsightStorage.prototype._brokenDecrypt = function(body) {
var key = cryptoUtil.kdf(this.password + this.email, 'mjuBtGybi/4=', 100);
log.debug('Trying legacy decrypt')
@ -35,10 +30,6 @@ EncryptedInsightStorage.prototype.getItem = function(name, callback) {
decryptedJson = self._brokenDecrypt(body);
}
if (!decryptedJson) {
decryptedJson = self._brokenDecryptUndef(body);
}
if (!decryptedJson) {
log.debug('Could not decrypt value.');
return callback('PNOTFOUND');

15
js/plugins/EncryptedLocalStorage.js
View File

@ -19,17 +19,30 @@ EncryptedLocalStorage.prototype._brokenDecrypt = function(body) {
};
EncryptedLocalStorage.prototype._brokenDecryptUndef = function(body) {
var badkey = undefined + SEPARATOR + undefined;
console.log('[EncryptedLocalStorage.js.25:badkey:]',badkey); //TODO
return cryptoUtil.decrypt(badkey, body);
};
EncryptedLocalStorage.prototype.getItem = function(name, callback) {
var self = this;
LocalStorage.prototype.getItem.apply(this, [name,
function(err, body) {
var decryptedJson = cryptoUtil.decrypt(self.email + SEPARATOR + self.password, body);
if (!decryptedJson) {
log.debug('Could not decrypt value using current decryption schema');
decryptedJson = self._brokenDecrypt(body);
}
if (!decryptedJson) {
decryptedJson = self._brokenDecryptUndef(body);
}
if (!decryptedJson) {
log.debug('Could not decrypt value.');
return callback('PNOTFOUND');