added aad encryption

frontend/src/fileReceiver.js

@@ -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

frontend/src/fileSender.js

@@ -8,6 +8,7 @@ class FileSender extends EventEmitter {
     super();
     this.file = file;
     this.iv = window.crypto.getRandomValues(new Uint8Array(12));
+    this.aad = window.crypto.getRandomValues(new Uint8Array(6));
   }
 
   static delete(fileId, token) {
@@ -60,7 +61,8 @@ class FileSender extends EventEmitter {
             {
               name: 'AES-GCM',
               iv: this.iv,
-              tagLength: 128
+              tagLength: 128,
+              additionalData: this.aad
             },
             secretKey,
             plaintext
@@ -77,6 +79,7 @@ class FileSender extends EventEmitter {
           const fd = new FormData();
           fd.append('fname', file.name);
           fd.append('data', blob, file.name);
+          fd.append('aad', this.aad);
 
           const xhr = new XMLHttpRequest();
 

frontend/src/utils.js

@@ -20,6 +20,7 @@ function strToIv(str) {
   return iv;
 }
 
+
 function notify(str) {
   if (!('Notification' in window)) {
     return;
@@ -32,8 +33,13 @@ function notify(str) {
   }
 }
 
+function strToUintArr(str) {
+  return new Uint8Array(str.split(",").map(x => parseInt(x)));
+}
+
 module.exports = {
   ivToStr,
   strToIv,
-  notify
+  notify,
+  strToUintArr
 };