Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 10:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant IdentityKeyUtil helper.

Browse Source
This commit is contained in:
Jordan Rose
2025-10-10 06:19:38 -07:00
committed by Cody Henthorne
parent 76f65198bb
commit f4f2976907
11 changed files with 27 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/test/java/org/thoughtcrime/securesms/contacts/paged/SafetyNumberRepositoryTest.kt
View File

@@ -17,7 +17,7 @@ import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.signal.libsignal.protocol.IdentityKeyPair
import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore
import org.thoughtcrime.securesms.database.IdentityTable
import org.thoughtcrime.securesms.database.RecipientDatabaseTestUtils
@@ -79,7 +79,7 @@ class SafetyNumberRepositoryTest {
val record = IdentityRecord(
recipientId = recipient.id,
identityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey,
identityKey = IdentityKeyPair.generate().publicKey,
verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
firstUse = false,
timestamp = 0,
@@ -141,7 +141,7 @@ class SafetyNumberRepositoryTest {
fun batchSafetyNumberCheckSync_batchOf1_oneChange() {
val other = recipientPool[1]
val otherAci = other.requireAci()
val otherNewIdentityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey
val otherNewIdentityKey = IdentityKeyPair.generate().publicKey
val keys = listOf(ContactSearchKey.RecipientSearchKey(other.id, false))
every {
@@ -175,7 +175,7 @@ class SafetyNumberRepositoryTest {
val other = recipientPool[1]
val secondOther = recipientPool[2]
val otherAci = other.requireAci()
val otherNewIdentityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey
val otherNewIdentityKey = IdentityKeyPair.generate().publicKey
val keys = listOf(ContactSearchKey.RecipientSearchKey(other.id, false), ContactSearchKey.RecipientSearchKey(secondOther.id, false))
every {

16
app/src/test/java/org/thoughtcrime/securesms/payments/MobileCoinPublicAddressProfileUtilTest.kt
View File

@@ -8,7 +8,7 @@ import assertk.assertions.isInstanceOf
import okio.ByteString
import org.junit.Before
import org.junit.Test
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.signal.libsignal.protocol.IdentityKeyPair
import org.thoughtcrime.securesms.util.Util
import org.whispersystems.signalservice.test.LibSignalLibraryUtil
@@ -20,7 +20,7 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_verify_an_address() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val address = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(address, identityKeyPair)
@@ -31,8 +31,8 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_not_verify_an_address_with_the_wrong_key() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val wrongPublicKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey
val identityKeyPair = IdentityKeyPair.generate()
val wrongPublicKey = IdentityKeyPair.generate().publicKey
val address = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(address, identityKeyPair)
@@ -43,7 +43,7 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_not_verify_a_tampered_signature() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val address = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(address, identityKeyPair)
val mobileCoinAddress = signedPaymentAddress.mobileCoin!!
@@ -66,7 +66,7 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_not_verify_a_tampered_address() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val addressBytes = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(addressBytes, identityKeyPair)
val mobileCoinAddress = signedPaymentAddress.mobileCoin!!
@@ -89,7 +89,7 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_not_verify_a_missing_signature() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val address = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(address, identityKeyPair)
@@ -109,7 +109,7 @@ class MobileCoinPublicAddressProfileUtilTest {
@Test
fun can_not_verify_a_missing_address() {
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val address = Util.getSecretBytes(100)
val signedPaymentAddress = MobileCoinPublicAddressProfileUtil.signPaymentsAddress(address, identityKeyPair)

4
app/src/test/java/org/thoughtcrime/securesms/registration/secondary/DeviceNameCipherTest.kt
View File

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.registration.secondary
import assertk.assertThat
import assertk.assertions.isEqualTo
import org.junit.Test
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.signal.libsignal.protocol.IdentityKeyPair
import org.thoughtcrime.securesms.devicelist.protos.DeviceName
import java.nio.charset.Charset
@@ -11,7 +11,7 @@ class DeviceNameCipherTest {
@Test
fun encryptDeviceName() {
val deviceName = "xXxCoolDeviceNamexXx"
val identityKeyPair = IdentityKeyUtil.generateIdentityKeyPair()
val identityKeyPair = IdentityKeyPair.generate()
val encryptedDeviceName = DeviceNameCipher.encryptDeviceName(deviceName.toByteArray(Charset.forName("UTF-8")), identityKeyPair)