Merge branch 'pgpainless-roundtripPacketFormat'

Author: dghgit

pg/src/test/java/org/bouncycastle/bcpg/test/OnePassSignaturePacketTest.java

@@ -105,8 +105,10 @@ private void roundtripV3Packet()
             isNull("round-tripped OPS v3 MUST NOT have salt",
                     after.getSalt());
 
-            isEncodingEqual("Packet encoding mismatch",
-                    before, after);
+            if (before.hasNewPacketFormat() && newTypeIdFormat)
+            {
+                isEncodingEqual(before, after);
+            }
         }
     }
 
@@ -178,7 +180,10 @@ private void roundtripV6Packet()
             isEncodingEqual("round-tripped OPS salt mismatch",
                     before.getSalt(), after.getSalt());
 
-            isEncodingEqual(before, after);
+            if (before.hasNewPacketFormat() && newTypeIdFormat)
+            {
+                isEncodingEqual(before, after);
+            }
         }
     }