dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed the file sha256 hash

Browse source
This commit is contained in:
Danny Coates 2017-08-07 14:05:13 -07:00
parent e7b90ea1b9
commit 9a150ddb22
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
5 changed files with 7 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

22
frontend/src/fileReceiver.js
View file

@ -45,7 +45,6 @@ class FileReceiver extends EventEmitter {
resolve([
{
data: this.result,
aad: meta.aad,
filename: meta.filename,
iv: meta.id
},
@ -69,7 +68,6 @@ class FileReceiver extends EventEmitter {
{
name: 'AES-GCM',
iv: hexToArray(fdata.iv),
additionalData: hexToArray(fdata.aad),
tagLength: 128
},
key,
@ -78,26 +76,8 @@ class FileReceiver extends EventEmitter {
.then(decrypted => {
return Promise.resolve(decrypted);
}),
fdata.filename,
hexToArray(fdata.aad)
decodeURIComponent(fdata.filename)
]);
})
.then(([decrypted, fname, proposedHash]) => {
this.emit('hashing');
return window.crypto.subtle
.digest('SHA-256', decrypted)
.then(calculatedHash => {
const integrity =
new Uint8Array(calculatedHash).toString() ===
proposedHash.toString();
if (!integrity) {
this.emit('unsafe', true);
return Promise.reject();
} else {
this.emit('safe', true);
return Promise.all([decrypted, decodeURIComponent(fname)]);
}
});
});
}
}