Add constant about flags in StreamUtil. Try use S2k constructor in SymmetricKeyEncSessionPacket

Author: gefeili

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

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

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

@@ -70,15 +70,15 @@ public SignatureSubpacket readPacket()
     {
         boolean[] flags = new boolean[3];
         int bodyLen = StreamUtil.readBodyLen(this, flags);
-        if (flags[0])
+        if (flags[StreamUtil.flag_eof])
         {
             return null;
         }
-        else if (flags[2])
+        else if (flags[StreamUtil.flag_partial])
         {
             throw new IOException("unexpected length header");
         }
-        boolean isLongLength = flags[1];
+        boolean isLongLength = flags[StreamUtil.flag_isLongLength];
 
         int tag = in.read();
 

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

@@ -111,7 +111,7 @@ static long readKeyID(BCPGInputStream in)
     static void writeTime(BCPGOutputStream pOut, long time)
         throws IOException
     {
-        StreamUtil.write4OctetLength(pOut, (int) time);
+        StreamUtil.write4OctetLength(pOut, (int)time);
     }
 
     static long readTime(BCPGInputStream in)
@@ -148,6 +148,9 @@ static int read4OctetLength(InputStream in)
         return (in.read() << 24) | (in.read() << 16) | (in.read() << 8) | in.read();
     }
 
+    static int flag_eof = 0;
+    static int flag_isLongLength = 1;
+    static int flag_partial = 2;
     /**
      * Note: flags is an array of three boolean values:
      * flags[0] indicates l is negative, flag for eof
@@ -162,7 +165,7 @@ static int readBodyLen(InputStream in, boolean[] flags)
         int bodyLen = -1;
         if (l < 0)
         {
-            flags[0] = true;
+            flags[flag_eof] = true;
         }
         if (l < 192)
         {
@@ -174,12 +177,12 @@ else if (l <= 223)
         }
         else if (l == 255)
         {
-            flags[1] = true;
+            flags[flag_isLongLength] = true;
             bodyLen = StreamUtil.read4OctetLength(in);
         }
         else
         {
-            flags[2] = true;
+            flags[flag_partial] = true;
             bodyLen = 1 << (l & 0x1f);
         }
         return bodyLen;

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

@@ -73,18 +73,18 @@ else if (version == VERSION_5 || version == VERSION_6)
             int s2kOctetCount = in.read();
 
             //TODO: use this line to replace the following code?
-            //s2k = new S2K(in);
-            s2kBytes = new byte[s2kOctetCount];
-            in.readFully(s2kBytes);
-            try
-            {
-                s2k = new S2K(new ByteArrayInputStream(s2kBytes));
-            }
-            catch (UnsupportedPacketVersionException e)
-            {
-
-                // We gracefully catch the error.
-            }
+            s2k = new S2K(in);
+//            s2kBytes = new byte[s2kOctetCount];
+//            in.readFully(s2kBytes);
+//            try
+//            {
+//                s2k = new S2K(new ByteArrayInputStream(s2kBytes));
+//            }
+//            catch (UnsupportedPacketVersionException e)
+//            {
+//
+//                // We gracefully catch the error.
+//            }
 
             int ivLen = next5Fields5Count - 3 - s2kOctetCount;
             iv = new byte[ivLen]; // also called nonce

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

@@ -72,15 +72,15 @@ public UserAttributeSubpacket readPacket()
     {
         boolean[] flags = new boolean[3];
         int bodyLen = StreamUtil.readBodyLen(this, flags);
-        if (flags[0])
+        if (flags[StreamUtil.flag_eof])
         {
             return null;
         }
-        else if (flags[2])
+        else if (flags[StreamUtil.flag_partial])
         {
             throw new IOException("unrecognised length reading user attribute sub packet");
         }
-        boolean longLength = flags[1];
+        boolean longLength = flags[StreamUtil.flag_isLongLength];
 
         int tag = in.read();