OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'soru/fix-ssss-cache' into 'main' 

fix: A few ssss fixes

See merge request famedly/famedlysdk!668
This commit is contained in:
Krille Fear 2021-03-09 18:12:30 +00:00
parent 4bd8359518 7ef288ec91
commit d43d4bedee
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/encryption/ssss.dart
View File

@ -275,6 +275,9 @@ class SSSS {
} }
// check if it is still valid // check if it is still valid
final keys = keyIdsFromType(type); final keys = keyIdsFromType(type);
if (keys == null) {
return null;
}
final isValid = (dbEntry) => final isValid = (dbEntry) =>
keys.contains(dbEntry.keyId) && keys.contains(dbEntry.keyId) &&
client.accountData[type].content['encrypted'][dbEntry.keyId] client.accountData[type].content['encrypted'][dbEntry.keyId]
@ -694,6 +697,10 @@ class OpenSSSS {
// now try to self-sign // now try to self-sign
if (ssss.encryption.crossSigning.enabled && if (ssss.encryption.crossSigning.enabled &&
ssss.client.userDeviceKeys[ssss.client.userID]?.masterKey != null && ssss.client.userDeviceKeys[ssss.client.userID]?.masterKey != null &&
(ssss
.keyIdsFromType(EventTypes.CrossSigningMasterKey)
?.contains(keyId) ??
false) &&
(ssss.client.isUnknownSession || (ssss.client.isUnknownSession ||
!ssss.client.userDeviceKeys[ssss.client.userID].masterKey !ssss.client.userDeviceKeys[ssss.client.userID].masterKey
.directVerified)) { .directVerified)) {