mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-02-02 07:31:38 +01:00
Code Issues Projects Releases Wiki Activity

remove txn argument that was removed in previous commit

Browse Source
This commit is contained in:
Bruno Windels 2023-03-24 23:07:22 +01:00
parent 762a91bd16
commit 90faad551a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/matrix/verification/CrossSigning.ts
View File

@ -210,11 +210,11 @@ export class CrossSigning {
if (!this.isMasterKeyTrusted) { if (!this.isMasterKeyTrusted) {
return UserTrust.OwnSetupError; return UserTrust.OwnSetupError;
} }
const ourMSK = await log.wrap("get our msk", log => this.deviceTracker.getCrossSigningKeyForUser(this.ownUserId, KeyUsage.Master, this.hsApi, undefined, log)); const ourMSK = await log.wrap("get our msk", log => this.deviceTracker.getCrossSigningKeyForUser(this.ownUserId, KeyUsage.Master, this.hsApi, log));
if (!ourMSK) { if (!ourMSK) {
return UserTrust.OwnSetupError; return UserTrust.OwnSetupError;
} }
const ourUSK = await log.wrap("get our usk", log => this.deviceTracker.getCrossSigningKeyForUser(this.ownUserId, KeyUsage.UserSigning, this.hsApi, undefined, log)); const ourUSK = await log.wrap("get our usk", log => this.deviceTracker.getCrossSigningKeyForUser(this.ownUserId, KeyUsage.UserSigning, this.hsApi, log));
if (!ourUSK) { if (!ourUSK) {
return UserTrust.OwnSetupError; return UserTrust.OwnSetupError;
} }
@ -222,7 +222,7 @@ export class CrossSigning {
if (ourUSKVerification !== SignatureVerification.Valid) { if (ourUSKVerification !== SignatureVerification.Valid) {
return UserTrust.OwnSetupError; return UserTrust.OwnSetupError;
} }
const theirMSK = await log.wrap("get their msk", log => this.deviceTracker.getCrossSigningKeyForUser(userId, KeyUsage.Master, this.hsApi, undefined, log)); const theirMSK = await log.wrap("get their msk", log => this.deviceTracker.getCrossSigningKeyForUser(userId, KeyUsage.Master, this.hsApi, log));
if (!theirMSK) { if (!theirMSK) {
/* assume that when they don't have an MSK, they've never enabled cross-signing on their client /* assume that when they don't have an MSK, they've never enabled cross-signing on their client
(or it's not supported) rather than assuming a setup error on their side. (or it's not supported) rather than assuming a setup error on their side.
@ -237,7 +237,7 @@ export class CrossSigning {
return UserTrust.UserSignatureMismatch; return UserTrust.UserSignatureMismatch;
} }
} }
const theirSSK = await log.wrap("get their ssk", log => this.deviceTracker.getCrossSigningKeyForUser(userId, KeyUsage.SelfSigning, this.hsApi, undefined, log)); const theirSSK = await log.wrap("get their ssk", log => this.deviceTracker.getCrossSigningKeyForUser(userId, KeyUsage.SelfSigning, this.hsApi, log));
if (!theirSSK) { if (!theirSSK) {
return UserTrust.UserSetupError; return UserTrust.UserSetupError;
} }