refactor around streams

Author: gefeili

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

@@ -206,8 +206,7 @@ private void writeHeader(
                 else if (bodyLen <= 0xffff)
                 {
                     this.write(hdr | 0x01);
-                    this.write((byte)(bodyLen >> 8));
-                    this.write((byte)(bodyLen));
+                    StreamUtil.write2OctetLength(this, (int)bodyLen);
                 }
                 else
                 {
@@ -339,22 +338,6 @@ public void writePacket(
         p.encode(this);
     }
 
-    void writeShort(short n)
-        throws IOException
-    {
-        out.write((byte)(n >> 8));
-        out.write((byte)n);
-    }
-
-    void writeInt(int n)
-        throws IOException
-    {
-        out.write(n >> 24);
-        out.write(n >> 16);
-        out.write(n >> 8);
-        out.write(n);
-    }
-
     /**
      * Write a packet to the stream.
      * The packet will use the old encoding format if {@link #packetFormat} is {@link PacketFormat#LEGACY}, otherwise

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

@@ -15,7 +15,7 @@ public MPInteger(
         BCPGInputStream    in)
         throws IOException
     {
-        int       length = (in.read() << 8) | in.read();
+        int       length = StreamUtil.read2OctetLength(in);
         byte[]    bytes = new byte[(length + 7) / 8];
 
         in.readFully(bytes);
@@ -43,8 +43,8 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        out.writeShort((short)value.bitLength());
-        
+        StreamUtil.write2OctetLength(out, value.bitLength());
+
         byte[]    bytes = value.toByteArray();
 
         if (bytes[0] == 0)

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

@@ -56,7 +56,7 @@ public class PublicKeyPacket
 
         if (version <= VERSION_3)
         {
-            validDays = (in.read() << 8) | in.read();
+            validDays = StreamUtil.read2OctetLength(in);
         }
 
         algorithm = (byte)in.read();
@@ -178,14 +178,14 @@ public byte[] getEncodedContents()
 
         if (version <= VERSION_3)
         {
-            pOut.writeShort((short)validDays);
+            StreamUtil.write2OctetLength(pOut, validDays);
         }
 
         pOut.write(algorithm);
 
         if (version == VERSION_6)
         {
-            pOut.writeInt(key.getEncoded().length);
+            StreamUtil.write4OctetLength(pOut, key.getEncoded().length);
         }
 
         pOut.writeObject((BCPGObject)key);