Move proper SignaturePacket copying to dedicated method

Author: vanitasvitae

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

@@ -8,6 +8,7 @@
 import org.bouncycastle.bcpg.sig.IssuerFingerprint;
 import org.bouncycastle.bcpg.sig.IssuerKeyID;
 import org.bouncycastle.bcpg.sig.SignatureCreationTime;
+import org.bouncycastle.openpgp.PGPSignatureSubpacketVector;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Pack;
 import org.bouncycastle.util.io.Streams;
@@ -446,6 +447,40 @@ public SignaturePacket(
         }
     }
 
+    public static SignaturePacket copyOfWith(SignaturePacket packet, SignatureSubpacket[] unhashedSubpackets)
+    {
+        if (packet.getVersion() == SignaturePacket.VERSION_6)
+        {
+            return new SignaturePacket(
+                packet.getVersion(),
+                packet.getSignatureType(),
+                packet.getKeyID(),
+                packet.getKeyAlgorithm(),
+                packet.getHashAlgorithm(),
+                packet.getHashedSubPackets(),
+                unhashedSubpackets,
+                packet.getFingerPrint(),
+                packet.getSignatureBytes(),
+                packet.getSalt()
+            );
+        }
+        else
+        {
+            return new SignaturePacket(
+                packet.getVersion(),
+                packet.hasNewPacketFormat(),
+                packet.getSignatureType(),
+                packet.getKeyID(),
+                packet.getKeyAlgorithm(),
+                packet.getHashAlgorithm(),
+                packet.getHashedSubPackets(),
+                unhashedSubpackets,
+                packet.getFingerPrint(),
+                packet.getSignature()
+            );
+        }
+    }
+
     /**
      * get the version number
      */

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

@@ -1032,39 +1032,8 @@ public static PGPSignature join(PGPSignature sig1, PGPSignature sig2)
         }
 
         SignatureSubpacket[] unhashed = (SignatureSubpacket[])merged.toArray(new SignatureSubpacket[0]);
-        if (sig1.getVersion() == SignaturePacket.VERSION_6)
-        {
-            return new PGPSignature(
-                new SignaturePacket(
-                    sig1.getVersion(),
-                    sig1.getSignatureType(),
-                    sig1.getKeyID(),
-                    sig1.getKeyAlgorithm(),
-                    sig1.getHashAlgorithm(),
-                    sig1.getHashedSubPackets().packets,
-                    unhashed,
-                    sig1.getDigestPrefix(),
-                    sig1.sigPck.getSignatureBytes(),
-                    sig1.getSalt()
-                )
-            );
-        }
-        else
-        {
-            return new PGPSignature(
-                new SignaturePacket(
-                    sig1.getVersion(),
-                    sig1.sigPck.hasNewPacketFormat(),
-                    sig1.getSignatureType(),
-                    sig1.getKeyID(),
-                    sig1.getKeyAlgorithm(),
-                    sig1.getHashAlgorithm(),
-                    sig1.getHashedSubPackets().packets,
-                    unhashed,
-                    sig1.getDigestPrefix(),
-                    sig1.sigPck.getSignature()
-                )
-            );
-        }
+        return new PGPSignature(
+            SignaturePacket.copyOfWith(sig1.sigPck, unhashed)
+        );
     }
 }