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

Use checkDeviceTrust when computing untrusted devices

Browse Source 
Apparently we missed using cross-signing trust in the js-sdk itself
This commit is contained in:
David Baker
2020-03-23 14:28:10 +00:00
parent 6a7a255081
commit e1ad2f8a21
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/algorithms/megolm.js
View File

@@ -955,8 +955,10 @@ MegolmEncryption.prototype._getDevicesInRoom = async function(room) {
continue; continue;
} }
const deviceTrust = this._crypto.checkDeviceTrust(userId, deviceId);
if (userDevices[deviceId].isBlocked() || if (userDevices[deviceId].isBlocked() ||
(userDevices[deviceId].isUnverified() && isBlacklisting) (!deviceTrust.isVerified() && isBlacklisting)
) { ) {
if (!blocked[userId]) { if (!blocked[userId]) {
blocked[userId] = {}; blocked[userId] = {};