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

support jwk keys to encrypt

Browse Source
This commit is contained in:
Bruno Windels 2020-11-11 11:47:39 +01:00
parent e2dd9b9f77
commit e9324ad678
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/matrix/e2ee/attachment.js
View File

@ -62,7 +62,7 @@ export async function encryptAttachment(platform, blob) {
const iv = await crypto.aes.generateIV(); const iv = await crypto.aes.generateIV();
const key = await crypto.aes.generateKey("jwk", 256); const key = await crypto.aes.generateKey("jwk", 256);
const buffer = await blob.readAsBuffer(); const buffer = await blob.readAsBuffer();
const ciphertext = await crypto.aes.encryptCTR({key, iv, data: buffer}); const ciphertext = await crypto.aes.encryptCTR({jwkKey: key, iv, data: buffer});
const digest = await crypto.digest("SHA-256", ciphertext); const digest = await crypto.digest("SHA-256", ciphertext);
return { return {
blob: platform.createBlob(ciphertext, blob.mimeType), blob: platform.createBlob(ciphertext, blob.mimeType),

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

@ -199,17 +199,19 @@ class AESCrypto {
} }
} }
async encryptCTR({key, iv, data}) { async encryptCTR({key, jwkKey, iv, data}) {
const opts = { const opts = {
name: "AES-CTR", name: "AES-CTR",
counter: iv, counter: iv,
length: 64, length: 64,
}; };
let aesKey; let aesKey;
const selectedKey = key || jwkKey;
const format = jwkKey ? "jwk" : "raw";
try { try {
aesKey = await subtleCryptoResult(this._subtleCrypto.importKey( aesKey = await subtleCryptoResult(this._subtleCrypto.importKey(
"raw", format,
key, selectedKey,
opts, opts,
false, false,
['encrypt'], ['encrypt'],