Add test for unknown unencrypted secret keys

Author: vanitasvitae

pg/src/test/java/org/bouncycastle/bcpg/test/UnknownPublicKeyPacketTest.java

@@ -7,6 +7,8 @@
 import org.bouncycastle.util.encoders.Hex;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
@@ -16,12 +18,19 @@ public class UnknownPublicKeyPacketTest
 {
 
     @Override
-    public String getName() {
+    public String getName()
+    {
         return "UnknownPublicKeyPacketTest";
     }
 
     @Override
-    public void performTest() throws Exception {
+    public void performTest()
+            throws Exception
+    {
+        parseUnknownV6PublicKey();
+    }
+
+    private void parseUnknownV6PublicKey() throws ParseException, IOException {
         SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
         parser.setTimeZone(TimeZone.getTimeZone("UTC"));
 

pg/src/test/java/org/bouncycastle/bcpg/test/UnknownSecretKeyPacketTest.java

@@ -0,0 +1,61 @@
+package org.bouncycastle.bcpg.test;
+
+import org.bouncycastle.bcpg.*;
+import org.bouncycastle.util.encoders.Hex;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+public class UnknownSecretKeyPacketTest
+        extends AbstractPacketTest
+{
+    @Override
+    public String getName()
+    {
+        return "UnknownSecretKeyPacketTest";
+    }
+
+    @Override
+    public void performTest()
+            throws Exception
+    {
+        parseUnknownUnencryptedV6SecretKey();
+    }
+
+    private void parseUnknownUnencryptedV6SecretKey()
+            throws IOException
+    {
+        Date creationTime = new Date((new Date().getTime() / 1000) * 1000);
+        SecretKeyPacket sk = new SecretKeyPacket(
+                new PublicKeyPacket(
+                        PublicKeyPacket.VERSION_6,
+                        99,
+                        creationTime,
+                        new UnknownBCPGKey(3, Hex.decode("c0ffee"))),
+                SymmetricKeyAlgorithmTags.NULL,
+                null,
+                null,
+                Hex.decode("0decaf"));
+
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        ArmoredOutputStream aOut = new ArmoredOutputStream(bOut);
+        BCPGOutputStream pOut = new BCPGOutputStream(aOut, PacketFormat.CURRENT);
+        sk.encode(pOut);
+        pOut.close();
+        aOut.close();
+
+        ByteArrayInputStream bIn = new ByteArrayInputStream(bOut.toByteArray());
+        ArmoredInputStream aIn = new ArmoredInputStream(bIn);
+        BCPGInputStream pIn = new BCPGInputStream(aIn);
+        SecretKeyPacket p = (SecretKeyPacket) pIn.readPacket();
+
+        isEncodingEqual(sk.getEncoded(PacketFormat.CURRENT), p.getEncoded(PacketFormat.CURRENT));
+    }
+
+    public static void main(String[] args)
+    {
+        runTest(new UnknownSecretKeyPacketTest());
+    }
+}