matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

MegolmDecryption::deviceId is not a valid field, sub it out for undefined as it isn't used meaningfully anyhow

Browse Source
This commit is contained in:
Michael Telatynski
2021-06-25 10:21:28 +01:00
parent 835aafcb17
commit d50e559f97
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/algorithms/megolm.ts
View File

@@ -1539,7 +1539,7 @@ class MegolmDecryption extends DecryptionAlgorithm {
await olmlib.encryptMessageForDevice( await olmlib.encryptMessageForDevice(
encryptedContent.ciphertext, encryptedContent.ciphertext,
this.userId, this.userId,
this.deviceId, undefined,
this.olmDevice, this.olmDevice,
sender, sender,
device, device,
@@ -1619,7 +1619,7 @@ class MegolmDecryption extends DecryptionAlgorithm {
return this.olmlib.encryptMessageForDevice( return this.olmlib.encryptMessageForDevice(
encryptedContent.ciphertext, encryptedContent.ciphertext,
this.userId, this.userId,
this.deviceId, undefined,
this.olmDevice, this.olmDevice,
userId, userId,
deviceInfo, deviceInfo,
@@ -1782,7 +1782,7 @@ class MegolmDecryption extends DecryptionAlgorithm {
olmlib.encryptMessageForDevice( olmlib.encryptMessageForDevice(
encryptedContent.ciphertext, encryptedContent.ciphertext,
this.userId, this.userId,
this.deviceId, undefined,
this.olmDevice, this.olmDevice,
userId, userId,
deviceInfo, deviceInfo,

1
src/crypto/olmlib.ts
View File

@@ -97,6 +97,7 @@ export async function encryptMessageForDevice(
const payload = { const payload = {
sender: ourUserId, sender: ourUserId,
// TODO this appears to no longer be used whatsoever
sender_device: ourDeviceId, sender_device: ourDeviceId,
// Include the Ed25519 key so that the recipient knows what // Include the Ed25519 key so that the recipient knows what