bitwarden/help
1
0
Fork 0
mirror of https://github.com/bitwarden/help synced 2025-12-10 21:33:18 +00:00
Code Issues Releases Wiki Activity

cleanup crypto

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-27 16:41:02 -04:00
parent 59a7e07ce5
commit 85b669d089
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crypto.html
View File

@@ -188,16 +188,6 @@
return decodedString; return decodedString;
} }
function fromB64(str) {
var binary_string = window.atob(str),
len = binary_string.length,
bytes = new Uint8Array(len);
for (var i = 0; i < len; i++) {
bytes[i] = binary_string.charCodeAt(i);
}
return bytes.buffer;
}
function toB64(buf) { function toB64(buf) {
var binary = '', var binary = '',
bytes = new Uint8Array(buf); bytes = new Uint8Array(buf);
@@ -287,7 +277,7 @@
iv: cipher.iv.arr.buffer iv: cipher.iv.arr.buffer
}; };
return new Promise(function (resolve) { var checkMacPromise = new Promise(function (resolve) {
if (cipher.encType == encTypes.AesCbc256_B64) { if (cipher.encType == encTypes.AesCbc256_B64) {
resolve(false); resolve(false);
return; return;
@@ -296,7 +286,9 @@
throw 'MAC key not provided.'; throw 'MAC key not provided.';
} }
resolve(true); resolve(true);
}) });
return checkMacPromise
.then(function (checkMac) { .then(function (checkMac) {
if (!checkMac) { if (!checkMac) {
return null; return null;