Skip to content

Remove profile cipher output stream which contains unsafe cipher usage #1654

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 31, 2025
Merged

Remove profile cipher output stream which contains unsafe cipher usage #1654

Show file tree
Hide file tree
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
90 changes: 0 additions & 90 deletions app/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions 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 @@ -32,9 +32,7 @@ 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
Expand Down
14 changes: 2 additions & 12 deletions app/src/main/java/org/thoughtcrime/securesms/attachments/AvatarUploadManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,19 @@ import kotlinx.coroutines.withContext
import network.loki.messenger.libsession_util.encrypt.Attachments
import network.loki.messenger.libsession_util.util.Bytes
import org.session.libsession.messaging.file_server.FileServerApi
import org.session.libsession.utilities.AESGCM
import org.session.libsession.utilities.ConfigFactoryProtocol
import org.session.libsession.utilities.TextSecurePreferences
import org.session.libsession.utilities.Util
import org.session.libsession.utilities.recipients.RemoteFile
import org.session.libsession.utilities.recipients.RemoteFile.Companion.toRemoteFile
import org.session.libsignal.streams.ProfileCipherOutputStream
import org.session.libsignal.utilities.Log
import org.thoughtcrime.securesms.dependencies.ManagerScope
import org.thoughtcrime.securesms.dependencies.OnAppStartupComponent
import org.thoughtcrime.securesms.util.castAwayType
import java.io.ByteArrayOutputStream
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration
import kotlin.time.Duration.Companion.days
import kotlin.time.Duration.Companion.seconds


Expand Down Expand Up @@ -90,15 +88,7 @@ class AvatarUploadManager @Inject constructor(
)
} else {
val key = Util.getSecretBytes(PROFILE_KEY_LENGTH)
val ciphertext = ByteArrayOutputStream().use { outputStream ->
ProfileCipherOutputStream(outputStream, key).use {
it.write(pictureData)
it.flush()
}

outputStream.toByteArray()
}

val ciphertext = AESGCM.encrypt(pictureData, key)
AttachmentProcessor.EncryptResult(ciphertext = ciphertext, key = key)
}

Expand Down