Changes around StreamUtil.

Author: gefeili

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

@@ -24,7 +24,7 @@
 public class ArmoredInputStream
     extends InputStream
 {
-    /*
+    /**
      * set up the decoding table.
      */
     private static final byte[] decodingTable;

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

@@ -323,6 +323,22 @@ 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);
+    }
+
     void writePacket(
         int tag,
         byte[] body)

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

@@ -43,10 +43,7 @@ public void encode(
         BCPGOutputStream    out)
         throws IOException
     {
-        int length = value.bitLength();
-        
-        out.write(length >> 8);
-        out.write(length);
+        out.writeShort((short)value.bitLength());
 
         byte[]    bytes = value.toByteArray();
 

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

@@ -162,19 +162,14 @@ public byte[] getEncodedContents()
 
         if (version <= VERSION_3)
         {
-            pOut.write((byte)(validDays >> 8));
-            pOut.write((byte)validDays);
+            pOut.writeShort((short)validDays);
         }
 
         pOut.write(algorithm);
 
         if (version == VERSION_6)
         {
-            int keyOctets = key.getEncoded().length;
-            pOut.write(keyOctets >> 24);
-            pOut.write(keyOctets >> 16);
-            pOut.write(keyOctets >> 8);
-            pOut.write(keyOctets);
+            pOut.writeInt(key.getEncoded().length);
         }
 
         pOut.writeObject((BCPGObject)key);

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

@@ -109,10 +109,7 @@ static long readKeyID(BCPGInputStream in)
     static void writeTime(BCPGOutputStream pOut, long time)
         throws IOException
     {
-        pOut.write((byte)(time >> 24));
-        pOut.write((byte)(time >> 16));
-        pOut.write((byte)(time >> 8));
-        pOut.write((byte)time);
+        pOut.writeInt((int) time);
     }
 
     static long readTime(BCPGInputStream in)

pg/src/test/java/org/bouncycastle/openpgp/test/PGPKeyRingTest.java

@@ -3211,7 +3211,6 @@ private void doTestNoExportPrivateKey(PGPKeyPair keyPair)
     public void testNullEncryption()
         throws Exception
     {
-        char[] passPhrase = "fred".toCharArray();
         KeyPairGenerator bareGenerator = KeyPairGenerator.getInstance("RSA", new BouncyCastleProvider());
         bareGenerator.initialize(2048);
         KeyPair rsaPair = bareGenerator.generateKeyPair();