SecretKeyPacket: Rethrow IllegalArgumentException for unknown AEAD algorithm

vanitasvitae · vanitasvitae · commit 521881388fde · 2025-07-11T15:01:29.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java
@@ -199,7 +199,14 @@ public class SecretKeyPacket
         }
         if (s2kUsage == USAGE_AEAD)
         {
-            iv = new byte[AEADUtils.getIVLength(aeadAlgorithm)];
+            try
+            {
+                iv = new byte[AEADUtils.getIVLength(aeadAlgorithm)];
+            }
+            catch (IllegalArgumentException e)
+            {
+                throw new MalformedPacketException("Unknown AEAD algorithm", e);
+            }
             Streams.readFully(in, iv);
         }
         else

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,14 @@ public class SecretKeyPacket`
`199`	`199`	`}`
`200`	`200`	`if (s2kUsage == USAGE_AEAD)`
`201`	`201`	`{`
`202`		`- iv = new byte[AEADUtils.getIVLength(aeadAlgorithm)];`
	`202`	`+ try`
	`203`	`+ {`
	`204`	`+ iv = new byte[AEADUtils.getIVLength(aeadAlgorithm)];`
	`205`	`+ }`
	`206`	`+ catch (IllegalArgumentException e)`
	`207`	`+ {`
	`208`	`+ throw new MalformedPacketException("Unknown AEAD algorithm", e);`
	`209`	`+ }`
`203`	`210`	`Streams.readFully(in, iv);`
`204`	`211`	`}`
`205`	`212`	`else`