mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

some more cleanup

Browse Source
This commit is contained in:
Bruno Windels 2020-10-27 14:35:47 +01:00
parent fcc4c21ad2
commit 932542bea0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platform/web/dom/Crypto.js
View File

@ -215,7 +215,6 @@ class AESLegacyCrypto {
* @return {BufferSource} [description] * @return {BufferSource} [description]
*/ */
async decryptCTR({key, jwkKey, iv, data, counterLength = 64}) { async decryptCTR({key, jwkKey, iv, data, counterLength = 64}) {
const aesjs = this._aesjs;
if (counterLength !== 64) { if (counterLength !== 64) {
throw new Error(`Unsupported counter length: ${counterLength}`); throw new Error(`Unsupported counter length: ${counterLength}`);
} }
@ -229,11 +228,12 @@ class AESLegacyCrypto {
if (jwkKey.kty !== "oct") { if (jwkKey.kty !== "oct") {
throw new Error(`Invalid key type, "oct" expected: ${jwkKey.kty}`); throw new Error(`Invalid key type, "oct" expected: ${jwkKey.kty}`);
} }
// need //var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; // convert base64-url to normal base64
const base64Key = jwkKey.k.replace(/-/g, "+").replace(/_/g, "/"); const base64UrlKey = jwkKey.k;
const base64Key = base64UrlKey.replace(/-/g, "+").replace(/_/g, "/");
key = base64.decode(base64Key); key = base64.decode(base64Key);
} }
const aesjs = this._aesjs;
var aesCtr = new aesjs.ModeOfOperation.ctr(new Uint8Array(key), new aesjs.Counter(new Uint8Array(iv))); var aesCtr = new aesjs.ModeOfOperation.ctr(new Uint8Array(key), new aesjs.Counter(new Uint8Array(iv)));
return aesCtr.decrypt(new Uint8Array(data)); return aesCtr.decrypt(new Uint8Array(data));
} }