refactored use of writePacket with oldFormat == true into a single me…

…thod. Relates to github bcgit#1010
merrymode · Sep 3, 2021 · 94e8b9c · 94e8b9c
1 parent 5f6b620
commit 94e8b9c
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 17 deletions.
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/BCPGOutputStream.java b/pg/src/main/java/org/bouncycastle/bcpg/BCPGOutputStream.java
@@ -313,7 +313,16 @@ public void writePacket(
     {
         p.encode(this);
     }
-
+
+    void writePacket(
+        int        tag,
+        byte[]     body)
+        throws IOException
+    {
+        this.writeHeader(tag, true, false, body.length);
+        this.write(body);
+    }
+
     void writePacket(
         int        tag,
         byte[]     body,

diff --git a/pg/src/main/java/org/bouncycastle/bcpg/ExperimentalPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/ExperimentalPacket.java
@@ -41,6 +41,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(tag, contents, true);
+        out.writePacket(tag, contents);
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/MarkerPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/MarkerPacket.java
@@ -23,6 +23,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(MARKER, marker, true);
+        out.writePacket(MARKER, marker);
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java b/pg/src/main/java/org/bouncycastle/bcpg/OnePassSignaturePacket.java
@@ -1,6 +1,7 @@
 package org.bouncycastle.bcpg;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 /**
  * generic signature object
@@ -112,6 +113,6 @@ public void encode(
 
         pOut.close();
 
-        out.writePacket(ONE_PASS_SIGNATURE, bOut.toByteArray(), true);
+        out.writePacket(ONE_PASS_SIGNATURE, bOut.toByteArray());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyEncSessionPacket.java
@@ -122,6 +122,6 @@ public void encode(
 
         pOut.close();
 
-        out.writePacket(PUBLIC_KEY_ENC_SESSION , bOut.toByteArray(), true);
+        out.writePacket(PUBLIC_KEY_ENC_SESSION , bOut.toByteArray());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/PublicKeyPacket.java
@@ -133,6 +133,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(PUBLIC_KEY, getEncodedContents(), true);
+        out.writePacket(PUBLIC_KEY, getEncodedContents());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/PublicSubkeyPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/PublicSubkeyPacket.java
@@ -1,6 +1,6 @@
 package org.bouncycastle.bcpg;
 
-import java.io.*;
+import java.io.IOException;
 import java.util.Date;
 
 /**
@@ -35,6 +35,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(PUBLIC_SUBKEY, getEncodedContents(), true);
+        out.writePacket(PUBLIC_SUBKEY, getEncodedContents());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SecretKeyPacket.java
@@ -182,6 +182,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(SECRET_KEY, getEncodedContents(), true);
+        out.writePacket(SECRET_KEY, getEncodedContents());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SecretSubkeyPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SecretSubkeyPacket.java
@@ -1,6 +1,6 @@
 package org.bouncycastle.bcpg;
 
-import java.io.*;
+import java.io.IOException;
 
 /**
  * basic packet for a PGP secret key
@@ -53,6 +53,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(SECRET_SUBKEY, getEncodedContents(), true);
+        out.writePacket(SECRET_SUBKEY, getEncodedContents());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java
@@ -527,7 +527,7 @@ else if (version == 4)
 
         pOut.close();
 
-        out.writePacket(SIGNATURE, bOut.toByteArray(), true);
+        out.writePacket(SIGNATURE, bOut.toByteArray());
     }
 
     private void setCreationTime()

diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SymmetricKeyEncSessionPacket.java
@@ -2,7 +2,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
 
 /**
  * Basic type for a symmetric encrypted session key packet
@@ -88,6 +87,6 @@ public void encode(
 
         pOut.close();
 
-        out.writePacket(SYMMETRIC_KEY_ENC_SESSION, bOut.toByteArray(), true);
+        out.writePacket(SYMMETRIC_KEY_ENC_SESSION, bOut.toByteArray());
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/TrustPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/TrustPacket.java
@@ -43,6 +43,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(TRUST, levelAndTrustAmount, true);
+        out.writePacket(TRUST, levelAndTrustAmount);
     }
 }
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/UserIDPacket.java b/pg/src/main/java/org/bouncycastle/bcpg/UserIDPacket.java
@@ -60,6 +60,6 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writePacket(USER_ID, idData, true);
+        out.writePacket(USER_ID, idData);
     }
 }