Update test client prekey usage to include kyber keys.

This commit is contained in:
Alex Bakon
2025-05-15 10:26:00 -04:00
committed by Cody Henthorne
parent 3644466263
commit 5e9824a180

View File

@@ -19,6 +19,7 @@ import org.signal.libsignal.protocol.util.KeyHelper
import org.signal.libsignal.zkgroup.profiles.ProfileKey import org.signal.libsignal.zkgroup.profiles.ProfileKey
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
import org.thoughtcrime.securesms.database.KyberPreKeyTable
import org.thoughtcrime.securesms.database.OneTimePreKeyTable import org.thoughtcrime.securesms.database.OneTimePreKeyTable
import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.SignedPreKeyTable import org.thoughtcrime.securesms.database.SignedPreKeyTable
@@ -102,6 +103,15 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
val selfSignedPreKeyRecord = SignalDatabase.signedPreKeys.get(getAliceServiceId(), selfSignedPreKeyId)!! val selfSignedPreKeyRecord = SignalDatabase.signedPreKeys.get(getAliceServiceId(), selfSignedPreKeyId)!!
val selfSignedKyberPreKeyId = SignalDatabase.rawDatabase
.select(KyberPreKeyTable.KEY_ID)
.from(KyberPreKeyTable.TABLE_NAME)
.where("${KyberPreKeyTable.ACCOUNT_ID} = ?", getAliceServiceId().toString())
.run()
.readToSingleInt(-1)
val selfSignedKyberPreKeyRecord = SignalDatabase.kyberPreKeys.get(getAliceServiceId(), selfSignedKyberPreKeyId)!!.record
return PreKeyBundle( return PreKeyBundle(
SignalStore.account.registrationId, SignalStore.account.registrationId,
1, 1,
@@ -110,7 +120,10 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
selfSignedPreKeyId, selfSignedPreKeyId,
selfSignedPreKeyRecord.keyPair.publicKey, selfSignedPreKeyRecord.keyPair.publicKey,
selfSignedPreKeyRecord.signature, selfSignedPreKeyRecord.signature,
getAlicePublicKey() getAlicePublicKey(),
selfSignedKyberPreKeyId,
selfSignedKyberPreKeyRecord.keyPair.publicKey,
selfSignedKyberPreKeyRecord.signature
) )
} }