mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-21 19:48:29 +00:00
Improve DecryptionErrorMessage envelope validation.
This commit is contained in:
@@ -4,7 +4,6 @@ import org.signal.libsignal.protocol.message.DecryptionErrorMessage
|
|||||||
import org.signal.libsignal.zkgroup.InvalidInputException
|
import org.signal.libsignal.zkgroup.InvalidInputException
|
||||||
import org.signal.libsignal.zkgroup.groups.GroupMasterKey
|
import org.signal.libsignal.zkgroup.groups.GroupMasterKey
|
||||||
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
|
import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
|
||||||
import org.whispersystems.signalservice.api.InvalidMessageStructureException
|
|
||||||
import org.whispersystems.signalservice.api.push.ServiceId
|
import org.whispersystems.signalservice.api.push.ServiceId
|
||||||
import org.whispersystems.signalservice.api.push.ServiceId.ACI
|
import org.whispersystems.signalservice.api.push.ServiceId.ACI
|
||||||
import org.whispersystems.signalservice.internal.push.AttachmentPointer
|
import org.whispersystems.signalservice.internal.push.AttachmentPointer
|
||||||
@@ -237,7 +236,7 @@ object EnvelopeContentValidator {
|
|||||||
return try {
|
return try {
|
||||||
DecryptionErrorMessage(serializedDecryptionErrorMessage)
|
DecryptionErrorMessage(serializedDecryptionErrorMessage)
|
||||||
Result.Valid
|
Result.Valid
|
||||||
} catch (e: InvalidMessageStructureException) {
|
} catch (e: Exception) {
|
||||||
Result.Invalid("[DecryptionErrorMessage] Bad decryption error message!", e)
|
Result.Invalid("[DecryptionErrorMessage] Bad decryption error message!", e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user