SignaturePacket: Move try-catch blocks into separate methods

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java

@@ -181,26 +181,11 @@ private void parseSubpackets(BCPGInputStream in)
             SignatureSubpacket p = (SignatureSubpacket)vec.elementAt(i);
             if (p instanceof IssuerKeyID)
             {
-                try
-                {
-                    keyID = ((IssuerKeyID) p).getKeyID();
-                }
-                catch (IllegalArgumentException e)
-                {
-                    // Too short key-id
-                    throw new MalformedPacketException("Malformed IssuerKeyId subpacket.", e);
-                }
+                keyID = parseKeyIdOrThrow((IssuerKeyID) p);
             }
             else if (p instanceof SignatureCreationTime)
             {
-                try
-                {
-                    creationTime = ((SignatureCreationTime) p).getTime().getTime();
-                }
-                catch (IllegalStateException e)
-                {
-                    throw new MalformedPacketException("Malformed SignatureCreationTime subpacket.", e);
-                }
+                creationTime = parseCreationTimeOrThrow((SignatureCreationTime) p);
             }
 
             hashedData[i] = p;
@@ -214,14 +199,7 @@ else if (p instanceof SignatureCreationTime)
             SignatureSubpacket p = (SignatureSubpacket)vec.elementAt(i);
             if (p instanceof IssuerKeyID)
             {
-                try
-                {
-                    keyID = ((IssuerKeyID) p).getKeyID();
-                }
-                catch (IllegalArgumentException e)
-                {
-                    throw new MalformedPacketException("Malformed IssuerKeyID subpacket.", e);
-                }
+                keyID = parseKeyIdOrThrow((IssuerKeyID) p);
             }
 
             unhashedData[i] = p;
@@ -231,6 +209,45 @@ else if (p instanceof SignatureCreationTime)
         setCreationTime();
     }
 
+    private long parseKeyIdOrThrow(IssuerKeyID keyID)
+        throws MalformedPacketException
+    {
+        try
+        {
+            return keyID.getKeyID();
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new MalformedPacketException("Malformed IssuerKeyID subpacket.", e);
+        }
+    }
+
+    private long parseKeyIdOrThrow(IssuerFingerprint fingerprint)
+        throws MalformedPacketException
+    {
+        try
+        {
+            return fingerprint.getKeyID();
+        }
+        catch (IllegalArgumentException e)
+        {
+            throw new MalformedPacketException("Malformed IssuerFingerprint subpacket.", e);
+        }
+    }
+
+    private long parseCreationTimeOrThrow(SignatureCreationTime creationTime)
+        throws MalformedPacketException
+    {
+        try
+        {
+            return creationTime.getTime().getTime();
+        }
+        catch (IllegalStateException e)
+        {
+            throw new MalformedPacketException("Malformed SignatureCreationTime subpacket.", e);
+        }
+    }
+
     private Vector<SignatureSubpacket> readSignatureSubpacketVector(BCPGInputStream in)
         throws IOException
     {
@@ -814,6 +831,7 @@ private void setCreationTime()
      * Therefore, we can also check the unhashed signature subpacket area.
      */
     private void setIssuerKeyId()
+        throws MalformedPacketException
     {
         if (keyID != 0L)
         {
@@ -825,12 +843,12 @@ private void setIssuerKeyId()
             SignatureSubpacket p  = hashedData[idx];
             if (p instanceof IssuerKeyID)
             {
-                keyID = ((IssuerKeyID) p).getKeyID();
+                keyID = parseKeyIdOrThrow((IssuerKeyID) p);
                 return;
             }
             if (p instanceof IssuerFingerprint)
             {
-                keyID = ((IssuerFingerprint) p).getKeyID();
+                keyID = parseKeyIdOrThrow((IssuerFingerprint) p);
                 return;
             }
         }
@@ -840,12 +858,12 @@ private void setIssuerKeyId()
             SignatureSubpacket p = unhashedData[idx];
             if (p instanceof IssuerKeyID)
             {
-                keyID = ((IssuerKeyID) p).getKeyID();
+                keyID = parseKeyIdOrThrow((IssuerKeyID) p);
                 return;
             }
             if (p instanceof IssuerFingerprint)
             {
-                keyID = ((IssuerFingerprint) p).getKeyID();
+                keyID = parseKeyIdOrThrow((IssuerFingerprint) p);
                 return;
             }
         }