Changes around StreamUtil

Author: gefeili

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

@@ -216,7 +216,7 @@ else if (l <= 223)
             }
             else if (l == 255)
             {
-                bodyLen = (this.read() << 24) | (this.read() << 16) |  (this.read() << 8)  | this.read();
+                bodyLen = StreamUtil.read4OctetLength(this);
             }
             else
             {
@@ -236,10 +236,10 @@ else if (l == 255)
                 bodyLen = this.read();
                 break;
             case 1:
-                bodyLen = (this.read() << 8) | this.read();
+                bodyLen = StreamUtil.read2OctetLength(this);
                 break;
             case 2:
-                bodyLen = (this.read() << 24) | (this.read() << 16) | (this.read() << 8) | this.read();
+                bodyLen = StreamUtil.read4OctetLength(this);
                 break;
             case 3:
                 partial = true;
@@ -410,7 +410,7 @@ else if (l <= 223)
             }
             else if (l == 255)
             {
-                dataLength = (in.read() << 24) | (in.read() << 16) |  (in.read() << 8)  | in.read();
+                dataLength = StreamUtil.read4OctetLength(in);
             }
             else
             {

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

@@ -35,7 +35,7 @@ public class LiteralDataPacket
             fileName[i] = (byte)ch;
         }
 
-        modDate = ((long)in.read() << 24) | (in.read() << 16) | (in.read() << 8) | in.read();
+        modDate = StreamUtil.readTime(in);
         if (modDate < 0)
         {
             throw new IOException("literal data truncated in header");
@@ -55,7 +55,7 @@ public int getFormat()
      */
     public long getModificationTime()
     {
-        return modDate * 1000L;
+        return modDate;
     }
 
     /**

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

@@ -36,7 +36,7 @@ public class PublicKeyPacket
         super(keyTag);
 
         version = in.read();
-        time = ((long)in.read() << 24) | (in.read() << 16) | (in.read() << 8) | in.read();
+        time = StreamUtil.read4OctetLength(in);
 
         if (version <= VERSION_3)
         {
@@ -47,7 +47,7 @@ public class PublicKeyPacket
         if (version == VERSION_6)
         {
             // TODO: Use keyOctets to be able to parse unknown keys
-            long keyOctets = ((long)in.read() << 24) | ((long)in.read() << 16) | ((long)in.read() << 8) | in.read();
+            long keyOctets = StreamUtil.read4OctetLength(in);
         }
 
         switch (algorithm)