mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Accept masterKey in ProvisionMessage

Browse source
This commit is contained in:
Fedor Indutny 2023-10-30 21:31:39 +01:00 • committed by GitHub
parent 79f7d64fb7
commit f1e8ffe720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/textsecure/AccountManager.ts
View file

@ -67,6 +67,7 @@ const DAY = 24 * 60 * 60 * 1000;
const STARTING_KEY_ID = 1;
const PROFILE_KEY_LENGTH = 32;
const MASTER_KEY_LENGTH = 32;
const KEY_TOO_OLD_THRESHOLD = 14 * DAY;
export const KYBER_KEY_ID_KEY: StorageKeyByServiceIdKind = {
@ -120,6 +121,7 @@ type CreateAccountSharedOptionsType = Readonly<{
aciKeyPair: KeyPairType;
pniKeyPair: KeyPairType;
profileKey: Uint8Array;
masterKey: Uint8Array | undefined;
}>;
type CreatePrimaryDeviceOptionsType = Readonly<{
@ -302,6 +304,7 @@ export default class AccountManager extends EventTarget {
const pniKeyPair = generateKeyPair();
const profileKey = getRandomBytes(PROFILE_KEY_LENGTH);
const accessKey = deriveAccessKey(profileKey);
const masterKey = getRandomBytes(MASTER_KEY_LENGTH);
const registrationBaton = this.server.startRegistration();
try {
@ -314,6 +317,7 @@ export default class AccountManager extends EventTarget {
pniKeyPair,
profileKey,
accessKey,
masterKey,
readReceipts: true,
});
} finally {
@ -428,6 +432,7 @@ export default class AccountManager extends EventTarget {
ourAci,
ourPni,
readReceipts: Boolean(provisionMessage.readReceipts),
masterKey: provisionMessage.masterKey,
});
} finally {
this.server.finishRegistration(registrationBaton);
@ -968,6 +973,7 @@ export default class AccountManager extends EventTarget {
aciKeyPair,
pniKeyPair,
profileKey,
masterKey,
readReceipts,
userAgent,
} = options;
@ -1202,6 +1208,9 @@ export default class AccountManager extends EventTarget {
if (userAgent) {
await storage.put('userAgent', userAgent);
}
if (masterKey) {
await storage.put('masterKey', Bytes.toBase64(masterKey));
}
await storage.put('read-receipt-setting', Boolean(readReceipts));