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

fixing conflicts

Browse source
This commit is contained in:
Abhinav Adduri 2017-07-13 10:21:16 -07:00
commit 6379a360fe
8 changed files with 123 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

48
frontend/src/utils.js
View file

@ -33,34 +33,38 @@ function notify(str) {
function gcmCompliant() {
try {
return window.crypto.subtle.generateKey(
{
name: 'AES-GCM',
length: 128
},
true,
['encrypt', 'decrypt']
).then(key => {
return window.crypto.subtle.encrypt(
return window.crypto.subtle
.generateKey(
{
name: 'AES-GCM',
iv: window.crypto.getRandomValues(new Uint8Array(12)),
additionalData: window.crypto.getRandomValues(new Uint8Array(6)),
tagLength: 128
length: 128
},
key,
new ArrayBuffer(8)
true,
['encrypt', 'decrypt']
)
.then(() => {
return Promise.resolve()
.then(key => {
return window.crypto.subtle
.encrypt(
{
name: 'AES-GCM',
iv: window.crypto.getRandomValues(new Uint8Array(12)),
additionalData: window.crypto.getRandomValues(new Uint8Array(6)),
tagLength: 128
},
key,
new ArrayBuffer(8)
)
.then(() => {
return Promise.resolve();
})
.catch(err => {
return Promise.reject();
});
})
.catch(err => {
return Promise.reject()
})
}).catch(err => {
return Promise.reject();
})
} catch(err) {
return Promise.reject();
});
} catch (err) {
return Promise.reject();
}
}