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

Explicit ACI check for contact serviceId

Browse source
This commit is contained in:
Fedor Indutny 2023-08-30 05:15:28 +02:00 committed by GitHub
parent 80a19d39de
commit 00f0ccd900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ts/util/safetyNumber.ts
View file

@ -15,6 +15,7 @@ import {
SafetyNumberIdentifierType, SafetyNumberIdentifierType,
SafetyNumberMode, SafetyNumberMode,
} from '../types/safetyNumber'; } from '../types/safetyNumber';
import { isAciString } from '../types/ServiceId';
const ITERATION_COUNT = 5200; const ITERATION_COUNT = 5200;
const E164_VERSION = 1; const E164_VERSION = 1;
@ -37,8 +38,9 @@ export async function generateSafetyNumbers(
const us = storage.protocol.getIdentityRecord(ourAci); const us = storage.protocol.getIdentityRecord(ourAci);
const ourKeyBuffer = us ? us.publicKey : null; const ourKeyBuffer = us ? us.publicKey : null;
const theirAci = const theirAci = isAciString(contact.serviceId)
contact.pni !== contact.serviceId ? contact.serviceId : undefined; ? contact.serviceId
: undefined;
const them = theirAci const them = theirAci
? await storage.protocol.getOrMigrateIdentityRecord(theirAci) ? await storage.protocol.getOrMigrateIdentityRecord(theirAci)
: undefined; : undefined;