Skip to content

[SES-4795] - Fix deterministic encryption #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

[SES-4795] - Fix deterministic encryption #1650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import coil3.request.allowConversionToBitmap
import coil3.request.allowHardware
import coil3.request.allowRgb565
import coil3.size.Precision
import dagger.Lazy
import dagger.hilt.android.qualifiers.ApplicationContext
import network.loki.messenger.libsession_util.encrypt.Attachments
import network.loki.messenger.libsession_util.image.GifUtils
Expand All @@ -30,7 +31,10 @@ import org.session.libsignal.streams.AttachmentCipherOutputStream
import org.session.libsignal.streams.PaddingInputStream
import org.session.libsignal.utilities.ByteArraySlice
import org.session.libsignal.utilities.ByteArraySlice.Companion.view
import org.session.libsignal.utilities.Hex
import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
import org.thoughtcrime.securesms.database.Storage
import org.thoughtcrime.securesms.util.AnimatedImageUtils
import org.thoughtcrime.securesms.util.BitmapUtil
import org.thoughtcrime.securesms.util.ImageUtils
Expand All @@ -50,6 +54,7 @@ typealias DigestResult = ByteArray
class AttachmentProcessor @Inject constructor(
@param:ApplicationContext private val context: Context,
private val imageLoader: Provider<ImageLoader>,
private val storage: Lazy<Storage>,
) {
class ProcessResult(
val data: ByteArray,
Expand Down Expand Up @@ -152,8 +157,16 @@ class AttachmentProcessor @Inject constructor(
*/
fun encryptDeterministically(plaintext: ByteArray, domain: Attachments.Domain): EncryptResult {
val cipherOut = ByteArray(Attachments.encryptedSize(plaintext.size.toLong()).toInt())
val privateKey = requireNotNull(storage.get().getUserED25519KeyPair()?.secretKey) {
"No user identity available"
}
check(privateKey.data.size == 64) {
"Invalid ED25519 private key size: ${privateKey.data.size}"
}
val seed = privateKey.data.sliceArray(0 until 32)

val key = Attachments.encryptBytes(
seed = Util.getSecretBytes(32),
seed = seed,
plaintextIn = plaintext,
cipherOut = cipherOut,
domain = domain,
Expand Down