Add StreamUtil.readBodyLen function

Author: gefeili

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

@@ -203,7 +203,7 @@ public Packet readPacket()
         {
             tag = hdr & 0x3f;
             boolean[] flags = new boolean[3];
-            bodyLen = StreamUtil.readBodyLen(this, this, flags);
+            bodyLen = StreamUtil.readBodyLen(this, flags);
             partial = flags[2];
         }
         else
@@ -376,7 +376,7 @@ private int loadDataLength()
             throws IOException
         {
             boolean[] flags = new boolean[3];
-            dataLength = StreamUtil.readBodyLen(in, in, flags);
+            dataLength = StreamUtil.readBodyLen(in, flags);
             if (flags[0])
             {
                 return -1;

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

@@ -69,7 +69,7 @@ public SignatureSubpacket readPacket()
         throws IOException
     {
         boolean[] flags = new boolean[3];
-        int bodyLen = StreamUtil.readBodyLen(this, in, flags);
+        int bodyLen = StreamUtil.readBodyLen(this, flags);
         if (flags[0])
         {
             return null;

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

@@ -154,7 +154,7 @@ static int read4OctetLength(InputStream in)
      * flags[1] indicates (is)longLength = true
      * flags[2] indicate partial = true
      */
-    static int readBodyLen(InputStream in, InputStream subIn, boolean[] flags)
+    static int readBodyLen(InputStream in, boolean[] flags)
         throws IOException
     {
         Arrays.fill(flags, false);
@@ -170,7 +170,7 @@ static int readBodyLen(InputStream in, InputStream subIn, boolean[] flags)
         }
         else if (l <= 223)
         {
-            bodyLen = ((l - 192) << 8) + (subIn.read()) + 192;
+            bodyLen = ((l - 192) << 8) + (in.read()) + 192;
         }
         else if (l == 255)
         {

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

@@ -71,7 +71,7 @@ public UserAttributeSubpacket readPacket()
         throws IOException
     {
         boolean[] flags = new boolean[3];
-        int bodyLen = StreamUtil.readBodyLen(this, in, flags);
+        int bodyLen = StreamUtil.readBodyLen(this, flags);
         if (flags[0])
         {
             return null;