TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conv

Browse Source
This commit is contained in:
Manav Rathi
2025-06-04 18:48:12 +05:30
parent e6707d9fcb
commit 65a8923799
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/apps/cast/src/services/render.ts
View File

@@ -195,16 +195,14 @@ const decryptEnteFile = async (
pubMagicMetadata,
...restFileProps
} = encryptedFile;
const fileKey = await worker.decryptB64(
encryptedKey,
keyDecryptionNonce,
const fileKey = await worker.decryptBoxB64(
{ encryptedData: encryptedKey, nonce: keyDecryptionNonce },
collectionKey,
);
const fileMetadata = await worker.decryptMetadataJSON({
encryptedDataB64: metadata.encryptedData,
decryptionHeaderB64: metadata.decryptionHeader,
keyB64: fileKey,
});
const fileMetadata = await worker.decryptMetadataJSON_New(
metadata,
fileKey,
);
let fileMagicMetadata: FileMagicMetadata | undefined;
let filePubMagicMetadata: FilePublicMagicMetadata | undefined;
if (magicMetadata?.data) {

15
web/packages/media/file.ts
View File

@@ -321,16 +321,15 @@ export async function decryptFile(
pubMagicMetadata,
...restFileProps
} = file;
const fileKey = await worker.decryptB64(
encryptedKey,
keyDecryptionNonce,
const fileKey = await worker.decryptBoxB64(
{ encryptedData: encryptedKey, nonce: keyDecryptionNonce },
collectionKey,
);
const fileMetadata = await worker.decryptMetadataJSON({
encryptedDataB64: metadata.encryptedData,
decryptionHeaderB64: metadata.decryptionHeader,
keyB64: fileKey,
});
const fileMetadata = await worker.decryptMetadataJSON_New(
metadata,
fileKey,
);
let fileMagicMetadata: FileMagicMetadata;
let filePubMagicMetadata: FilePublicMagicMetadata;
/* eslint-disable @typescript-eslint/no-unnecessary-condition */