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

added aad encryption

Browse source
This commit is contained in:
Abhinav Adduri 2017-06-20 14:33:28 -07:00 • committed by Danny Coates
parent 50995238bd
commit 34c367c49f
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
5 changed files with 52 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/fileReceiver.js
View file

@ -1,5 +1,5 @@
const EventEmitter = require('events');
const { strToIv } = require('./utils');
const { strToIv, strToUintArr } = require('./utils');
const Raven = window.Raven;
@ -36,6 +36,7 @@ class FileReceiver extends EventEmitter {
fileReader.onload = function() {
resolve({
data: this.result,
aad: xhr.getResponseHeader('Additional-Data'),
fname: xhr
.getResponseHeader('Content-Disposition')
.match(/=(.+)/)[1]
@ -65,12 +66,15 @@ class FileReceiver extends EventEmitter {
)
]).then(([fdata, key]) => {
const salt = this.salt;
console.log(strToUintArr(fdata.aad));
return Promise.all([
window.crypto.subtle.decrypt(
{
name: 'AES-GCM',
iv: salt,
tagLength: 128
tagLength: 128,
additionalData: strToUintArr(fdata.aad)
},
key,
fdata.data