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

use 128-bit GCM

Browse source
This commit is contained in:
Danny Coates 2017-06-28 11:30:14 -07:00
parent 34c367c49f
commit 4cb34844aa
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
3 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/src/fileReceiver.js
View file

@ -1,12 +1,12 @@
const EventEmitter = require('events');
const { strToIv, strToUintArr } = require('./utils');
const { hexToArray } = require('./utils');
const Raven = window.Raven;
class FileReceiver extends EventEmitter {
constructor() {
super();
this.salt = strToIv(location.pathname.slice(10, -1));
this.salt = hexToArray(location.pathname.slice(10, -1));
}
download() {
@ -55,7 +55,7 @@ class FileReceiver extends EventEmitter {
{
kty: 'oct',
k: location.hash.slice(1),
alg: 'A256GCM',
alg: 'A128GCM',
ext: true
},
{
@ -66,15 +66,13 @@ 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,
additionalData: strToUintArr(fdata.aad)
additionalData: hexToArray(fdata.aad)
},
key,
fdata.data