PGPObjectFactory: Catch IllegalArgumentException for illegal PKESK/SKESK/SEIPD/OED

packet combinations and rethrow as MalformedPacketException

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java

@@ -9,6 +9,7 @@
 import java.util.NoSuchElementException;
 
 import org.bouncycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.MalformedPacketException;
 import org.bouncycastle.bcpg.PacketTags;
 import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.bcpg.UnknownPacket;
@@ -148,7 +149,14 @@ public Object nextObject()
         case PacketTags.SYMMETRIC_KEY_ENC:
         case PacketTags.SYM_ENC_INTEGRITY_PRO:
         case PacketTags.AEAD_ENC_DATA:
-            return new PGPEncryptedDataList(in);
+            try
+            {
+                return new PGPEncryptedDataList(in);
+            }
+            catch (IllegalArgumentException e)
+            {
+                throw new MalformedPacketException("Malformed encrypted data.", e);
+            }
         case PacketTags.ONE_PASS_SIGNATURE:
             l = new ArrayList();