Refactoring in openpgp

Author: peterdettman

pg/src/main/java/org/bouncycastle/openpgp/PGPObjectFactory.java

@@ -83,9 +83,8 @@ public PGPObjectFactory(
     public Object nextObject()
         throws IOException
     {
-        List l;
-
-        switch (in.nextPacketTag())
+        int tag = in.nextPacketTag();
+        switch (tag)
         {
         case -1:
             return null;
@@ -96,7 +95,8 @@ public Object nextObject()
         case PacketTags.EXPERIMENTAL_4:
             return in.readPacket();
         case PacketTags.SIGNATURE:
-            l = new ArrayList();
+        {
+            ArrayList l = new ArrayList();
 
             while (in.nextPacketTag() == PacketTags.SIGNATURE)
             {
@@ -117,6 +117,7 @@ public Object nextObject()
             }
 
             return new PGPSignatureList((PGPSignature[])l.toArray(new PGPSignature[l.size()]));
+        }
         case PacketTags.SECRET_KEY:
             try
             {
@@ -150,7 +151,8 @@ public Object nextObject()
         case PacketTags.AEAD_ENC_DATA:
             return new PGPEncryptedDataList(in);
         case PacketTags.ONE_PASS_SIGNATURE:
-            l = new ArrayList();
+        {
+            ArrayList l = new ArrayList();
 
             while (in.nextPacketTag() == PacketTags.ONE_PASS_SIGNATURE)
             {
@@ -165,24 +167,23 @@ public Object nextObject()
             }
 
             return new PGPOnePassSignatureList((PGPOnePassSignature[])l.toArray(new PGPOnePassSignature[l.size()]));
+        }
         case PacketTags.MARKER:
             return new PGPMarker(in);
         case PacketTags.PADDING:
             return new PGPPadding(in);
         case PacketTags.MOD_DETECTION_CODE:
-            return new UnknownPacket(PacketTags.MOD_DETECTION_CODE, in);
         case PacketTags.USER_ID:
-            return new UnknownPacket(PacketTags.USER_ID, in);
         case PacketTags.USER_ATTRIBUTE:
-            return new UnknownPacket(PacketTags.USER_ATTRIBUTE, in);
+            return new UnknownPacket(tag, in);
         }
 
-        int tag = in.nextPacketTag();
+        int nextTag = in.nextPacketTag();
         UnknownPacket unknownPacket = (UnknownPacket)in.readPacket();
         if (throwForUnknownCriticalPackets && unknownPacket.isCritical())
         {
             // Leave the error message intact for backwards compatibility
-            throw new IOException("unknown object in stream: " + tag);
+            throw new IOException("unknown object in stream: " + nextTag);
         }
         return unknownPacket;
     }

pg/src/main/java/org/bouncycastle/openpgp/PGPPadding.java

@@ -95,7 +95,7 @@ public PGPPadding(int len)
      */
     public PGPPadding(int len, SecureRandom random)
     {
-        this.p = new PaddingPacket(len, random);
+        this.p = new PaddingPacket(len, CryptoServicesRegistrar.getSecureRandom(random));
     }
 
     /**

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

@@ -183,7 +183,7 @@ private void knownV5TestVectorDecryptionTests()
     private void knownV6TestVectorDecryptionTests()
         throws IOException, PGPException
     {
-        // Test known-good V6 test vectors    TODO: decryption tests
+        // Test known-good V6 test vectors
         testBcDecryption(V6_EAX_PACKET_SEQUENCE, PASSWORD, PLAINTEXT);
         testBcDecryption(V6_OCB_PACKET_SEQUENCE, PASSWORD, PLAINTEXT);
         testBcDecryption(V6_GCM_PACKET_SEQUENCE, PASSWORD, PLAINTEXT);