Add Util.encodePGPSignatures

Author: gefeili

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

@@ -737,10 +737,7 @@ public void encode(OutputStream outStream, boolean forTransfer)
 
         if (subSigs == null)    // not a sub-key
         {
-            for (int i = 0; i != keySigs.size(); i++)
-            {
-                ((PGPSignature)keySigs.get(i)).encode(out);
-            }
+            Util.encodePGPSignatures(out, keySigs, false);
 
             for (int i = 0; i != ids.size(); i++)
             {
@@ -763,18 +760,12 @@ public void encode(OutputStream outStream, boolean forTransfer)
                 }
 
                 List<PGPSignature> sigs = (List<PGPSignature>)idSigs.get(i);
-                for (int j = 0; j != sigs.size(); j++)
-                {
-                    ((PGPSignature)sigs.get(j)).encode(out, forTransfer);
-                }
+                Util.encodePGPSignatures(out, sigs, forTransfer);
             }
         }
         else
         {
-            for (int j = 0; j != subSigs.size(); j++)
-            {
-                ((PGPSignature)subSigs.get(j)).encode(out, forTransfer);
-            }
+            Util.encodePGPSignatures(out, subSigs, forTransfer);
         }
     }
 

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

@@ -752,10 +752,7 @@ public void encode(OutputStream outStream)
 
         if (pub.subSigs == null)        // is not a sub key
         {
-            for (int i = 0; i != pub.keySigs.size(); i++)
-            {
-                ((PGPSignature)pub.keySigs.get(i)).encode(out);
-            }
+            Util.encodePGPSignatures(out, pub.keySigs, false);
 
             for (int i = 0; i != pub.ids.size(); i++)
             {
@@ -778,19 +775,12 @@ public void encode(OutputStream outStream)
                 }
 
                 List<PGPSignature> sigs = (List<PGPSignature>)pub.idSigs.get(i);
-
-                for (int j = 0; j != sigs.size(); j++)
-                {
-                    ((PGPSignature)sigs.get(j)).encode(out);
-                }
+                Util.encodePGPSignatures(out, sigs, false);
             }
         }
         else
         {
-            for (int j = 0; j != pub.subSigs.size(); j++)
-            {
-                ((PGPSignature)pub.subSigs.get(j)).encode(out);
-            }
+            Util.encodePGPSignatures(out, pub.subSigs, false);
         }
     }
 

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

@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
 
 import org.bouncycastle.bcpg.BCPGInputStream;
 
@@ -32,4 +34,13 @@ static BCPGInputStream createBCPGInputStream(InputStream pgIn, int tag1, int tag
 
         throw new IOException("unexpected tag " + bcIn.nextPacketTag() + " encountered");
     }
+
+    static void encodePGPSignatures(OutputStream stream, List<PGPSignature> sigs, boolean forTransfer)
+        throws IOException
+    {
+        for (int i = 0; i != sigs.size(); i++)
+        {
+            ((PGPSignature)sigs.get(i)).encode(stream, forTransfer);
+        }
+    }
 }