mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-11-20 03:25:52 +01:00
Code Issues Projects Releases Wiki Activity

return undefined if we don't have the signing key

Browse Source
This commit is contained in:
Bruno Windels 2023-03-07 14:40:11 +01:00
parent a065189836
commit a69246fb5a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,10 +165,13 @@ export class CrossSigning {
}
const keyToSign = await this.deviceTracker.getCrossSigningKeyForUser(userId, KeyUsage.Master, this.hsApi, log);
if (!keyToSign) {
return undefined;
return;
}
const signingKey = await this.getSigningKey(KeyUsage.UserSigning);
if (!signingKey) {
return;
}
delete keyToSign.signatures;
const signingKey = await this.getSigningKey(KeyUsage.UserSigning);
// add signature to keyToSign
this.signKey(keyToSign, signingKey);
const payload = {
@ -248,8 +251,11 @@ export class CrossSigning {
});
}
private async signDeviceKey(keyToSign: DeviceKey, log: ILogItem): Promise<DeviceKey> {
private async signDeviceKey(keyToSign: DeviceKey, log: ILogItem): Promise<DeviceKey | undefined> {
const signingKey = await this.getSigningKey(KeyUsage.SelfSigning);
if (!signingKey) {
return undefined;
}
// add signature to keyToSign
this.signKey(keyToSign, signingKey);
// so the payload format of a signature is a map from userid to key id of the signed key
@ -265,11 +271,12 @@ export class CrossSigning {
return keyToSign;
}
private async getSigningKey(usage: KeyUsage): Promise<Uint8Array> {
private async getSigningKey(usage: KeyUsage): Promise<Uint8Array | undefined> {
const txn = await this.storage.readTxn([this.storage.storeNames.accountData]);
const seedStr = await this.secretStorage.readSecret(`m.cross_signing.${usage}`, txn);
const seed = new Uint8Array(this.platform.encoding.base64.decode(seedStr));
return seed;
if (seedStr) {
return new Uint8Array(this.platform.encoding.base64.decode(seedStr));
}
}
private signKey(keyToSign: DeviceKey | CrossSigningKey, signingKey: Uint8Array) {