Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-07 06:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wiping of the secrets added

Browse Source
This commit is contained in:
mhelander 2017-09-14 23:52:50 +03:00
parent b2298042ff
commit f7fb93ffad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sea.js
View File

@ -774,11 +774,13 @@
hash: pbkdf2.hash, hash: pbkdf2.hash,
}, key, pbkdf2.ks*8); }, key, pbkdf2.ks*8);
}).then(function(result){ }).then(function(result){
pass = getRandomBytes(pass.length);
return new Buffer(result, 'binary').toString('base64'); return new Buffer(result, 'binary').toString('base64');
}).then(resolve).catch(function(e){ Gun.log(e); reject(e) }); }).then(resolve).catch(function(e){ Gun.log(e); reject(e) });
}) || function(resolve, reject){ // For NodeJS crypto.pkdf2 rocks }) || function(resolve, reject){ // For NodeJS crypto.pkdf2 rocks
try{ try{
var hash = nodeCrypto.pbkdf2Sync(pass,new Buffer(salt, 'utf8'),pbkdf2.iter,pbkdf2.ks,nHash); var hash = nodeCrypto.pbkdf2Sync(pass,new Buffer(salt, 'utf8'),pbkdf2.iter,pbkdf2.ks,nHash);
pass = getRandomBytes(pass.length);
resolve(hash && hash.toString('base64')); resolve(hash && hash.toString('base64'));
}catch(e){ reject(e) }; }catch(e){ reject(e) };
}; };
@ -829,9 +831,11 @@
if(typeof window !== 'undefined'){ // Browser doesn't run createCipheriv if(typeof window !== 'undefined'){ // Browser doesn't run createCipheriv
crypto.subtle.importKey('raw', key, 'AES-CBC', false, ['encrypt']) crypto.subtle.importKey('raw', key, 'AES-CBC', false, ['encrypt'])
.then(function(aesKey){ .then(function(aesKey){
key = getRandomBytes(key.length);
crypto.subtle.encrypt({ crypto.subtle.encrypt({
name: 'AES-CBC', iv: iv name: 'AES-CBC', iv: iv
}, aesKey, new TextEncoder().encode(m)).then(function(ct){ }, aesKey, new TextEncoder().encode(m)).then(function(ct){
aesKey = getRandomBytes(32);
r.ct = new Buffer(ct, 'binary').toString('base64'); r.ct = new Buffer(ct, 'binary').toString('base64');
return JSON.stringify(r); return JSON.stringify(r);
}).then(resolve).catch(function(e){ Gun.log(e); reject(e) }); }).then(resolve).catch(function(e){ Gun.log(e); reject(e) });
@ -840,6 +844,7 @@
try{ try{
var cipher = nodeCrypto.createCipheriv(aes.enc, key, iv); var cipher = nodeCrypto.createCipheriv(aes.enc, key, iv);
r.ct = cipher.update(m, 'utf8', 'base64') + cipher.final('base64'); r.ct = cipher.update(m, 'utf8', 'base64') + cipher.final('base64');
key = getRandomBytes(key.length);
}catch(e){ Gun.log(e); return reject(e) } }catch(e){ Gun.log(e); return reject(e) }
resolve(JSON.stringify(r)); resolve(JSON.stringify(r));
} }
@ -854,9 +859,11 @@
if(typeof window !== 'undefined'){ // Browser doesn't run createDecipheriv if(typeof window !== 'undefined'){ // Browser doesn't run createDecipheriv
crypto.subtle.importKey('raw', key, 'AES-CBC', false, ['decrypt']) crypto.subtle.importKey('raw', key, 'AES-CBC', false, ['decrypt'])
.then(function(aesKey){ .then(function(aesKey){
key = getRandomBytes(key.length);
crypto.subtle.decrypt({ crypto.subtle.decrypt({
name: 'AES-CBC', iv: iv name: 'AES-CBC', iv: iv
}, aesKey, new Buffer(m.ct, 'base64')).then(function(ct){ }, aesKey, new Buffer(m.ct, 'base64')).then(function(ct){
aesKey = getRandomBytes(32);
var ctUtf8 = new TextDecoder('utf8').decode(ct); var ctUtf8 = new TextDecoder('utf8').decode(ct);
try{ return ctUtf8.slice ? JSON.parse(ctUtf8) : ctUtf8; try{ return ctUtf8.slice ? JSON.parse(ctUtf8) : ctUtf8;
}catch(e){ return ctUtf8 } }catch(e){ return ctUtf8 }
@ -866,6 +873,7 @@
try{ try{
var decipher = nodeCrypto.createDecipheriv(aes.enc, key, iv); var decipher = nodeCrypto.createDecipheriv(aes.enc, key, iv);
r = decipher.update(m.ct, 'base64', 'utf8') + decipher.final('utf8'); r = decipher.update(m.ct, 'base64', 'utf8') + decipher.final('utf8');
key = getRandomBytes(key.length);
}catch(e){ Gun.log(e); return reject(e) } }catch(e){ Gun.log(e); return reject(e) }
resolve(r); resolve(r);
} }