From a3438d334514cda725a92bada8cbc91f11c453e4 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 25 Jan 2024 14:37:55 -0500
Subject: [PATCH] Improve DecryptionErrorMessage envelope validation.

---
 .../signalservice/api/messages/EnvelopeContentValidator.kt     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
index 42efc68dcd..8a44bc6949 100644
--- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
+++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
@@ -4,7 +4,6 @@ import org.signal.libsignal.protocol.message.DecryptionErrorMessage
 import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
 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.ACI
 import org.whispersystems.signalservice.internal.push.AttachmentPointer
@@ -237,7 +236,7 @@ object EnvelopeContentValidator {
     return try {
       DecryptionErrorMessage(serializedDecryptionErrorMessage)
       Result.Valid
-    } catch (e: InvalidMessageStructureException) {
+    } catch (e: Exception) {
       Result.Invalid("[DecryptionErrorMessage] Bad decryption error message!", e)
     }
   }