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

10
frontend/src/fileSender.js
View file

@ -1,5 +1,5 @@
const EventEmitter = require('events');
const { ivToStr } = require('./utils');
const { arrayToHex } = require('./utils');
const Raven = window.Raven;
@ -41,8 +41,7 @@ class FileSender extends EventEmitter {
window.crypto.subtle.generateKey(
{
name: 'AES-GCM',
length: 256,
tagLength: 128
length: 128
},
true,
['encrypt', 'decrypt']
@ -61,7 +60,6 @@ class FileSender extends EventEmitter {
{
name: 'AES-GCM',
iv: this.iv,
tagLength: 128,
additionalData: this.aad
},
secretKey,
@ -73,13 +71,13 @@ class FileSender extends EventEmitter {
.then(([encrypted, keydata]) => {
return new Promise((resolve, reject) => {
const file = this.file;
const fileId = ivToStr(this.iv);
const fileId = arrayToHex(this.iv);
const dataView = new DataView(encrypted);
const blob = new Blob([dataView], { type: file.type });
const fd = new FormData();
fd.append('fname', file.name);
fd.append('data', blob, file.name);
fd.append('aad', this.aad);
fd.append('aad', arrayToHex(this.aad));
const xhr = new XMLHttpRequest();