From 3988b46a60e63ea5a5b45c07a6ac4fb5df608ee9 Mon Sep 17 00:00:00 2001 From: Ruben De Smet Date: Sun, 14 Jan 2024 20:03:16 +0100 Subject: [PATCH] Fix typo for generateLastRes*t*ortKyberPreKey. --- app/src/main/baseline-prof.txt | 2 +- .../settings/app/changenumber/ChangeNumberRepository.kt | 2 +- .../main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java | 2 +- .../org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt | 2 +- .../securesms/registration/RegistrationRepository.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/baseline-prof.txt b/app/src/main/baseline-prof.txt index ced744e965..ab1aa0fb0b 100644 --- a/app/src/main/baseline-prof.txt +++ b/app/src/main/baseline-prof.txt @@ -22113,7 +22113,7 @@ HSPLorg/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream;->readFull HSPLorg/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream;->createFor(Lorg/thoughtcrime/securesms/crypto/AttachmentSecret;Ljava/io/File;Z)Landroid/util/Pair; HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->()V HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->generateKyberPreKey(ILorg/signal/libsignal/protocol/ecc/ECPrivateKey;)Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord; -HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->generateLastRestortKyberPreKey(ILorg/signal/libsignal/protocol/ecc/ECPrivateKey;)Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord; +HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->generateLastResortKyberPreKey(ILorg/signal/libsignal/protocol/ecc/ECPrivateKey;)Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord; HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->generateSignedPreKey(ILorg/signal/libsignal/protocol/ecc/ECPrivateKey;)Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord; HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->storeLastResortKyberPreKey(Lorg/whispersystems/signalservice/api/SignalServiceAccountDataStore;Lorg/thoughtcrime/securesms/crypto/storage/PreKeyMetadataStore;Lorg/signal/libsignal/protocol/state/KyberPreKeyRecord;)V HSPLorg/thoughtcrime/securesms/crypto/PreKeyUtil;->storeSignedPreKey(Lorg/signal/libsignal/protocol/state/SignalProtocolStore;Lorg/thoughtcrime/securesms/crypto/storage/PreKeyMetadataStore;Lorg/signal/libsignal/protocol/state/SignedPreKeyRecord;)V diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt index e2d9741ccc..fe5ac7ca69 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt @@ -352,7 +352,7 @@ class ChangeNumberRepository( val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) { PreKeyUtil.generateAndStoreLastResortKyberPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey) } else { - PreKeyUtil.generateLastRestortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey) + PreKeyUtil.generateLastResortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey) } devicePniLastResortKyberPreKeys[deviceId] = KyberPreKeyEntity(lastResortKyberPreKeyRecord.id, lastResortKyberPreKeyRecord.keyPair.publicKey, lastResortKyberPreKeyRecord.signature) diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java index 490bbdf105..79ec5e3f9b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/PreKeyUtil.java @@ -188,7 +188,7 @@ public class PreKeyUtil { return record; } - public synchronized static @NonNull KyberPreKeyRecord generateLastRestortKyberPreKey(int id, @NonNull ECPrivateKey privateKey) { + public synchronized static @NonNull KyberPreKeyRecord generateLastResortKyberPreKey(int id, @NonNull ECPrivateKey privateKey) { Log.i(TAG, "Generating last resort kyber prekey..."); return generateKyberPreKey(id, privateKey); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt index 9cd540989a..ab98ad5cd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PnpInitializeDevicesJob.kt @@ -189,7 +189,7 @@ class PnpInitializeDevicesJob private constructor(parameters: Parameters) : Base val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) { pniProtocolStore.loadKyberPreKey(SignalStore.account().pniPreKeys.lastResortKyberPreKeyId) } else { - PreKeyUtil.generateLastRestortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey) + PreKeyUtil.generateLastResortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey) } devicePniLastResortKyberPreKeys[deviceId] = KyberPreKeyEntity(lastResortKyberPreKeyRecord.id, lastResortKyberPreKeyRecord.keyPair.publicKey, lastResortKyberPreKeyRecord.signature) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java index 0d6c0cbabc..50bee3842f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationRepository.java @@ -181,7 +181,7 @@ public final class RegistrationRepository { public static PreKeyCollection generateSignedAndLastResortPreKeys(IdentityKeyPair identity, PreKeyMetadataStore metadataStore) { SignedPreKeyRecord signedPreKey = PreKeyUtil.generateSignedPreKey(metadataStore.getNextSignedPreKeyId(), identity.getPrivateKey()); - KyberPreKeyRecord lastResortKyberPreKey = PreKeyUtil.generateLastRestortKyberPreKey(metadataStore.getNextKyberPreKeyId(), identity.getPrivateKey()); + KyberPreKeyRecord lastResortKyberPreKey = PreKeyUtil.generateLastResortKyberPreKey(metadataStore.getNextKyberPreKeyId(), identity.getPrivateKey()); return new PreKeyCollection( identity.getPublicKey(),