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

reformat

Browse source
This commit is contained in:
Danny Coates 2017-07-12 10:53:29 -07:00
parent ee8ff3d220
commit b32e63c305
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB
7 changed files with 133 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

13
frontend/src/fileSender.js
View file

@ -61,8 +61,8 @@ class FileSender extends EventEmitter {
window.crypto.subtle.digest('SHA-256', plaintext).then(hash => {
self.emit('hashing', false);
self.emit('encrypting', true);
resolve({plaintext: plaintext, hash: new Uint8Array(hash)});
})
resolve({ plaintext: plaintext, hash: new Uint8Array(hash) });
});
};
reader.onerror = function(err) {
reject(err);
@ -81,14 +81,17 @@ class FileSender extends EventEmitter {
},
secretKey,
file.plaintext
).then(encrypted => {
)
.then(encrypted => {
self.emit('encrypting', false);
return new Promise((resolve, reject) => {
resolve(encrypted);
})
});
}),
window.crypto.subtle.exportKey('jwk', secretKey),
new Promise((resolve, reject) => { resolve(file.hash) })
new Promise((resolve, reject) => {
resolve(file.hash);
})
]);
})
.then(([encrypted, keydata, hash]) => {