diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 2d0e2fca33..9fed124912 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.utilities.Util -import org.session.libsignal.libsignal.kdf.HKDFv3 +import org.session.libsignal.crypto.kdf.HKDFv3 import org.session.libsignal.libsignal.util.ByteUtil import java.io.* import java.lang.Exception diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index 9d82e9c7e0..d9e127a92e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -19,7 +19,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.Conversions import org.session.libsession.utilities.Util -import org.session.libsignal.libsignal.kdf.HKDFv3 +import org.session.libsignal.crypto.kdf.HKDFv3 import org.session.libsignal.libsignal.util.ByteUtil import java.io.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 1651405d4c..416347a0b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -29,7 +29,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index e1782e271f..1058acdcfa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; import org.session.libsession.utilities.DownloadUtilities; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; +import org.session.libsignal.streams.AttachmentCipherInputStream; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase; import org.session.libsession.messaging.threads.GroupRecord; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 36baa2860d..4f7407ecbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -13,7 +13,7 @@ import org.session.libsession.utilities.DownloadUtilities; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; -import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; +import org.session.libsignal.streams.ProfileCipherInputStream; import org.session.libsignal.service.api.push.exceptions.PushNetworkException; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index 79f462b9f8..a4807c6f62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -19,7 +19,7 @@ import com.goterl.lazycode.lazysodium.utils.KeyPair import kotlinx.android.synthetic.main.activity_register.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index fac748efc4..6b92f066b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -4,9 +4,9 @@ import android.content.ContentValues import android.content.Context import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.Snode import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.utilities.PublicKeyValidation diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt index 2883c985f2..0f7cf57ddd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt @@ -7,9 +7,9 @@ import org.thoughtcrime.securesms.loki.utilities.getAll import org.thoughtcrime.securesms.loki.utilities.getString import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate import org.session.libsignal.utilities.Hex -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.utilities.PublicKeyValidation import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 745e9067f9..f5a614ded0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -4,9 +4,9 @@ import android.content.Context import android.util.Log import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.* -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 85f826d3b7..db7f5fcddd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -9,7 +9,7 @@ import com.bumptech.glide.load.data.DataFetcher; import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.InvalidMessageException; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; +import org.session.libsignal.streams.AttachmentCipherInputStream; import java.io.File; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt index 816ede3414..5fa1dd3e3f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt @@ -19,7 +19,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.GroupRecord import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceGroup diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index 0a6666230f..362b2e81ed 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.DownloadUtilities -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream +import org.session.libsignal.streams.AttachmentCipherInputStream import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index ae81540052..a89831a140 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -13,14 +13,14 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI -import org.session.libsignal.service.api.crypto.AttachmentCipherOutputStream +import org.session.libsignal.streams.AttachmentCipherOutputStream import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream -import org.session.libsignal.service.internal.crypto.PaddingInputStream +import org.session.libsignal.streams.PaddingInputStream import org.session.libsignal.service.internal.push.PushAttachmentData import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.util.Util -import org.session.libsignal.service.loki.PlaintextOutputStreamFactory +import org.session.libsignal.streams.PlaintextOutputStreamFactory import org.session.libsignal.utilities.Log class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val message: Message, val messageSendJobID: String) : Job { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 38e505c3e8..938c027b13 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -5,9 +5,9 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt index 1a15d34860..0a4dd4c27c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt @@ -6,9 +6,9 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt index a3c81c9390..902ed97dfc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt @@ -5,7 +5,7 @@ import com.goterl.lazycode.lazysodium.LazySodiumAndroid import com.goterl.lazycode.lazysodium.SodiumAndroid import com.goterl.lazycode.lazysodium.interfaces.Box import com.goterl.lazycode.lazysodium.interfaces.Sign -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index e677a2534b..792a15a9ab 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -12,8 +12,8 @@ import org.session.libsession.messaging.sending_receiving.notifications.PushNoti import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.Curve -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.Curve +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 7ec058a64f..da9be94210 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -20,9 +20,9 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 90a4704440..b5bf24d33c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -11,7 +11,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.crypto.DiffieHellman -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream +import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java index 06de335b4c..ebbeef0a10 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java @@ -22,13 +22,13 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import androidx.annotation.NonNull; -import org.session.libsignal.libsignal.ecc.ECPublicKey; +import org.session.libsignal.crypto.ecc.ECPublicKey; import org.session.libsignal.libsignal.IdentityKey; import org.session.libsignal.libsignal.IdentityKeyPair; import org.session.libsignal.libsignal.InvalidKeyException; -import org.session.libsignal.libsignal.ecc.Curve; -import org.session.libsignal.libsignal.ecc.ECKeyPair; -import org.session.libsignal.libsignal.ecc.ECPrivateKey; +import org.session.libsignal.crypto.ecc.Curve; +import org.session.libsignal.crypto.ecc.ECKeyPair; +import org.session.libsignal.crypto.ecc.ECPrivateKey; import org.session.libsignal.utilities.Base64; diff --git a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt index 92326cfc68..5d52c1175f 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt @@ -7,9 +7,9 @@ import com.goterl.lazycode.lazysodium.utils.Key import com.goterl.lazycode.lazysodium.utils.KeyPair import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Hex -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair object KeyPairUtilities { diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index e95305b122..14e9475cff 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -6,7 +6,7 @@ import nl.komponents.kovenant.deferred import okio.Buffer import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream +import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java index 0cf12b71aa..7b7ad4f3d0 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java @@ -3,12 +3,11 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; import org.whispersystems.curve25519.Curve25519; import org.whispersystems.curve25519.Curve25519KeyPair; import org.session.libsignal.libsignal.InvalidKeyException; - import static org.whispersystems.curve25519.Curve25519.BEST; public class Curve { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java index 377de7625e..5c6d8c4583 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public class DjbECPrivateKey implements ECPrivateKey { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java index b6c2d3e405..b3fcabf255 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java @@ -4,10 +4,9 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; import org.session.libsignal.libsignal.util.ByteUtil; - import java.math.BigInteger; import java.util.Arrays; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java index db9538b99a..3797654a96 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public class ECKeyPair { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java similarity index 82% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java index b7398ee1be..47b6848edd 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public interface ECPrivateKey { public byte[] serialize(); diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java similarity index 86% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java index c4cbca4395..4f1f3e18b4 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public interface ECPublicKey extends Comparable { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java rename to libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java index c0b65b38af..3295f06e52 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.kdf; +package org.session.libsignal.crypto.kdf; import java.io.ByteArrayOutputStream; import java.security.InvalidKeyException; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java rename to libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java index e275706933..1455276d67 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.kdf; +package org.session.libsignal.crypto.kdf; public class HKDFv3 extends HKDF { @Override diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java index 7350ceb329..795f3bdbfe 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java +++ b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java @@ -6,8 +6,8 @@ package org.session.libsignal.libsignal; -import org.session.libsignal.libsignal.ecc.Curve; -import org.session.libsignal.libsignal.ecc.ECPublicKey; +import org.session.libsignal.crypto.ecc.Curve; +import org.session.libsignal.crypto.ecc.ECPublicKey; import org.session.libsignal.utilities.Hex; /** diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java index 84b843548b..65eedc7db1 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java @@ -5,7 +5,7 @@ */ package org.session.libsignal.libsignal; -import org.session.libsignal.libsignal.ecc.ECPrivateKey; +import org.session.libsignal.crypto.ecc.ECPrivateKey; /** * Holder for public and private identity key pair. diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index 250d9730a9..ec8be2c45e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -7,14 +7,11 @@ package org.session.libsignal.service.api; import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; -import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java b/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java deleted file mode 100644 index 7f1cd6051e..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.session.libsignal.service.api.crypto; - -import com.google.protobuf.InvalidProtocolBufferException; - -import org.session.libsignal.libsignal.ecc.ECKeyPair; -import org.session.libsignal.metadata.InvalidMetadataMessageException; -import org.session.libsignal.metadata.ProtocolInvalidMessageException; -import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceContent; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage.Preview; -import org.session.libsignal.service.api.messages.SignalServiceEnvelope; -import org.session.libsignal.service.api.messages.SignalServiceGroup; -import org.session.libsignal.service.api.messages.SignalServiceReceiptMessage; -import org.session.libsignal.service.api.messages.SignalServiceTypingMessage; -import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.PushTransportDetails; -import org.session.libsignal.service.internal.push.SignalServiceProtos; -import org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.Content; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage; -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.DELIVER; - -/** - * This is used to decrypt received {@link SignalServiceEnvelope}s. - * - * @author Moxie Marlinspike - */ -public class SignalServiceCipher { - - @SuppressWarnings("unused") - private static final String TAG = SignalServiceCipher.class.getSimpleName(); - - private final LokiAPIDatabaseProtocol apiDB; - - public SignalServiceCipher(LokiAPIDatabaseProtocol apiDB) - { - this.apiDB = apiDB; - } - - /** - * Decrypt a received {@link SignalServiceEnvelope} - * - * @param envelope The received SignalServiceEnvelope - * - * @return a decrypted SignalServiceContent - */ - public SignalServiceContent decrypt(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException,ProtocolInvalidMessageException - { - try { - Plaintext plaintext = decrypt(envelope, envelope.getContent()); - Content message = Content.parseFrom(plaintext.getData()); - - if (message.hasConfigurationMessage()) { - SignalServiceCipher.Metadata metadata = plaintext.getMetadata(); - SignalServiceContent content = new SignalServiceContent(message, metadata.getSender(), metadata.getSenderDevice(), metadata.getTimestamp()); - - if (message.hasDataMessage()) { - setProfile(message.getDataMessage(), content); - SignalServiceDataMessage signalServiceDataMessage = createSignalServiceMessage(metadata, message.getDataMessage()); - content.setDataMessage(signalServiceDataMessage); - } - - return content; - } else if (message.hasDataMessage()) { - DataMessage dataMessage = message.getDataMessage(); - - SignalServiceDataMessage signalServiceDataMessage = createSignalServiceMessage(plaintext.getMetadata(), dataMessage); - SignalServiceContent content = new SignalServiceContent(signalServiceDataMessage, - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp(), - plaintext.getMetadata().isNeedsReceipt()); - - setProfile(dataMessage, content); - - return content; - } else if (message.hasReceiptMessage()) { - return new SignalServiceContent(createReceiptMessage(plaintext.getMetadata(), message.getReceiptMessage()), - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp()); - } else if (message.hasTypingMessage()) { - return new SignalServiceContent(createTypingMessage(plaintext.getMetadata(), message.getTypingMessage()), - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp()); - } - - return null; - } catch (InvalidProtocolBufferException e) { - throw new InvalidMetadataMessageException(e); - } - } - - private void setProfile(DataMessage message, SignalServiceContent content) { - if (!message.hasProfile()) { return; } - SignalServiceProtos.DataMessage.LokiProfile profile = message.getProfile(); - if (profile.hasDisplayName()) { content.setSenderDisplayName(profile.getDisplayName()); } - if (profile.hasProfilePicture()) { content.setSenderProfilePictureURL(profile.getProfilePicture()); } - } - - protected Plaintext decrypt(SignalServiceEnvelope envelope, byte[] ciphertext) throws InvalidMetadataMessageException - { - throw new IllegalStateException("This shouldn't be used anymore"); - } - - private SignalServiceDataMessage createSignalServiceMessage(Metadata metadata, DataMessage content) throws ProtocolInvalidMessageException { - SignalServiceGroup groupInfo = createGroupInfo(content); - List attachments = new LinkedList(); - boolean expirationUpdate = ((content.getFlags() & DataMessage.Flags.EXPIRATION_TIMER_UPDATE_VALUE) != 0); - SignalServiceDataMessage.Quote quote = createQuote(content); - List previews = createPreviews(content); - ClosedGroupControlMessage closedGroupControlMessage = content.getClosedGroupControlMessage(); - String syncTarget = content.getSyncTarget(); - - for (AttachmentPointer pointer : content.getAttachmentsList()) { - attachments.add(createAttachmentPointer(pointer)); - } - - if (content.hasTimestamp() && content.getTimestamp() != metadata.getTimestamp()) { - throw new ProtocolInvalidMessageException(new InvalidMessageException("Timestamps don't match: " + content.getTimestamp() + " vs " + metadata.getTimestamp()), - metadata.getSender(), - metadata.getSenderDevice()); - } - - return new SignalServiceDataMessage(metadata.getTimestamp(), - groupInfo, - attachments, - content.getBody(), - content.getExpireTimer(), - expirationUpdate, - content.hasProfileKey() ? content.getProfileKey().toByteArray() : null, - quote, - new ArrayList<>(), - previews, - closedGroupControlMessage, - syncTarget); - } - - private SignalServiceReceiptMessage createReceiptMessage(Metadata metadata, ReceiptMessage content) { - SignalServiceReceiptMessage.Type type; - - if (content.getType() == ReceiptMessage.Type.DELIVERY) type = SignalServiceReceiptMessage.Type.DELIVERY; - else if (content.getType() == ReceiptMessage.Type.READ) type = SignalServiceReceiptMessage.Type.READ; - else type = SignalServiceReceiptMessage.Type.UNKNOWN; - - return new SignalServiceReceiptMessage(type, content.getTimestampList(), metadata.getTimestamp()); - } - - private SignalServiceTypingMessage createTypingMessage(Metadata metadata, TypingMessage content) throws ProtocolInvalidMessageException { - SignalServiceTypingMessage.Action action; - - if (content.getAction() == TypingMessage.Action.STARTED) action = SignalServiceTypingMessage.Action.STARTED; - else if (content.getAction() == TypingMessage.Action.STOPPED) action = SignalServiceTypingMessage.Action.STOPPED; - else action = SignalServiceTypingMessage.Action.UNKNOWN; - - if (content.hasTimestamp() && content.getTimestamp() != metadata.getTimestamp()) { - throw new ProtocolInvalidMessageException(new InvalidMessageException("Timestamps don't match: " + content.getTimestamp() + " vs " + metadata.getTimestamp()), - metadata.getSender(), - metadata.getSenderDevice()); - } - - return new SignalServiceTypingMessage(action, content.getTimestamp()); - } - - private SignalServiceDataMessage.Quote createQuote(DataMessage content) { - if (!content.hasQuote()) return null; - - List attachments = new LinkedList(); - - for (DataMessage.Quote.QuotedAttachment attachment : content.getQuote().getAttachmentsList()) { - attachments.add(new SignalServiceDataMessage.Quote.QuotedAttachment(attachment.getContentType(), - attachment.getFileName(), - attachment.hasThumbnail() ? createAttachmentPointer(attachment.getThumbnail()) : null)); - } - - return new SignalServiceDataMessage.Quote(content.getQuote().getId(), - new SignalServiceAddress(content.getQuote().getAuthor()), - content.getQuote().getText(), - attachments); - } - - private List createPreviews(DataMessage content) { - if (content.getPreviewCount() <= 0) return null; - - List results = new LinkedList(); - - for (DataMessage.Preview preview : content.getPreviewList()) { - SignalServiceAttachment attachment = null; - - if (preview.hasImage()) { - attachment = createAttachmentPointer(preview.getImage()); - } - - results.add(new Preview(preview.getUrl(), - preview.getTitle(), - Optional.fromNullable(attachment))); - } - - return results; - } - - private SignalServiceAttachmentPointer createAttachmentPointer(AttachmentPointer pointer) { - return new SignalServiceAttachmentPointer(pointer.getId(), - pointer.getContentType(), - pointer.getKey().toByteArray(), - pointer.hasSize() ? Optional.of(pointer.getSize()) : Optional.absent(), - pointer.hasThumbnail() ? Optional.of(pointer.getThumbnail().toByteArray()): Optional.absent(), - pointer.getWidth(), pointer.getHeight(), - pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.absent(), - pointer.hasFileName() ? Optional.of(pointer.getFileName()) : Optional.absent(), - (pointer.getFlags() & AttachmentPointer.Flags.VOICE_MESSAGE_VALUE) != 0, - pointer.hasCaption() ? Optional.of(pointer.getCaption()) : Optional.absent(), - pointer.getUrl()); - - } - - private SignalServiceGroup createGroupInfo(DataMessage content) { - if (!content.hasGroup()) return null; - - SignalServiceGroup.Type type; - - switch (content.getGroup().getType()) { - case DELIVER: type = SignalServiceGroup.Type.DELIVER; break; - case UPDATE: type = SignalServiceGroup.Type.UPDATE; break; - case QUIT: type = SignalServiceGroup.Type.QUIT; break; - case REQUEST_INFO: type = SignalServiceGroup.Type.REQUEST_INFO; break; - default: type = SignalServiceGroup.Type.UNKNOWN; break; - } - - if (content.getGroup().getType() != DELIVER) { - String name = null; - List members = null; - SignalServiceAttachmentPointer avatar = null; - List admins = null; - - if (content.getGroup().hasName()) { - name = content.getGroup().getName(); - } - - if (content.getGroup().getMembersCount() > 0) { - members = content.getGroup().getMembersList(); - } - - if (content.getGroup().hasAvatar()) { - AttachmentPointer pointer = content.getGroup().getAvatar(); - - avatar = new SignalServiceAttachmentPointer(pointer.getId(), - pointer.getContentType(), - pointer.getKey().toByteArray(), - Optional.of(pointer.getSize()), - Optional.absent(), 0, 0, - Optional.fromNullable(pointer.hasDigest() ? pointer.getDigest().toByteArray() : null), - Optional.absent(), - false, - Optional.absent(), - pointer.getUrl()); - } - - if (content.getGroup().getAdminsCount() > 0) { - admins = content.getGroup().getAdminsList(); - } - - return new SignalServiceGroup(type, content.getGroup().getId().toByteArray(), SignalServiceGroup.GroupType.SIGNAL, name, members, avatar, admins); - } - - return new SignalServiceGroup(content.getGroup().getId().toByteArray(), SignalServiceGroup.GroupType.SIGNAL); - } - - protected static class Metadata { - private final String sender; - private final int senderDevice; - private final long timestamp; - private final boolean needsReceipt; - - public Metadata(String sender, int senderDevice, long timestamp, boolean needsReceipt) { - this.sender = sender; - this.senderDevice = senderDevice; - this.timestamp = timestamp; - this.needsReceipt = needsReceipt; - } - - public String getSender() { - return sender; - } - - public int getSenderDevice() { - return senderDevice; - } - - public long getTimestamp() { - return timestamp; - } - - public boolean isNeedsReceipt() { - return needsReceipt; - } - } - - protected static class Plaintext { - private final Metadata metadata; - private final byte[] data; - - public Plaintext(Metadata metadata, byte[] data) { - this.metadata = metadata; - this.data = data; - } - - public Metadata getMetadata() { - return metadata; - } - - public byte[] getData() { - return data; - } - } -} diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java index 8a6599ab05..f5a0657d31 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.AttachmentCipherOutputStream; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.AttachmentCipherOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java index 904fe31d2f..d4806c5103 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java index 9e68793fcb..592c037d7b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java index 962146dcf1..14a76c3991 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java @@ -1,8 +1,8 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; +import org.session.libsignal.streams.ProfileCipherOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt index 2b4fc4f32a..c1886ed0cc 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt @@ -1,7 +1,6 @@ package org.session.libsignal.service.loki -import org.session.libsignal.libsignal.ecc.ECKeyPair -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.crypto.ecc.ECKeyPair import java.util.* interface LokiAPIDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 15c1bd59b6..4ad149698f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -4,11 +4,10 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import org.session.libsignal.libsignal.InvalidMacException; import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.service.internal.util.ContentLengthInputStream; import org.session.libsignal.service.internal.util.Util; import java.io.File; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java index e214f99e1e..578dc82c69 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java similarity index 90% rename from libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java index 71322466bd..8c7217cbb7 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java @@ -1,6 +1,8 @@ -package org.session.libsignal.service.internal.util; +package org.session.libsignal.streams; +import org.session.libsignal.service.internal.util.Util; + import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java index 77e45082d6..331fa32c87 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import java.io.FilterOutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java index 4040a00785..e57aca6fc0 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.internal.crypto; - +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt rename to libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt index 412f66458f..2c1e118dac 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt +++ b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt @@ -1,6 +1,5 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.streams -import org.session.libsignal.service.api.crypto.DigestingOutputStream import org.session.libsignal.service.internal.push.http.OutputStreamFactory import java.io.OutputStream diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java index 42ed1ac9f7..c982a503d7 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.crypto; - +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java index e663ba0e82..9d4e13a0c2 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt index 40b094d760..d6ec9800be 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt @@ -1,7 +1,7 @@ package org.session.libsignal.service.loki.utilities import org.session.libsignal.libsignal.IdentityKeyPair -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair fun ByteArray.toHexString(): String { return joinToString("") { String.format("%02x", it) }