Implement PGPTrust pendant to TrustPacket

Avoids ClassCastException when parsing cert with TrustPacket in PGPObjectFactory

Author: vanitasvitae

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

@@ -10,10 +10,10 @@
 
 import org.bouncycastle.bcpg.BCPGInputStream;
 import org.bouncycastle.bcpg.PacketTags;
+import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.bcpg.UnknownPacket;
 import org.bouncycastle.bcpg.UnsupportedPacketVersionException;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
-import org.bouncycastle.util.Iterable;
 
 /**
  * General class for reading a PGP object stream.
@@ -141,6 +141,8 @@ public Object nextObject()
             return new PGPCompressedData(in);
         case PacketTags.LITERAL_DATA:
             return new PGPLiteralData(in);
+        case PacketTags.TRUST:
+            return new PGPTrust(in);
         case PacketTags.PUBLIC_KEY_ENC_SESSION:
         case PacketTags.SYMMETRIC_KEY_ENC_SESSION:
         case PacketTags.SYMMETRIC_KEY_ENC:

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

@@ -0,0 +1,36 @@
+package org.bouncycastle.openpgp;
+
+import org.bouncycastle.bcpg.BCPGInputStream;
+import org.bouncycastle.bcpg.TrustPacket;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class PGPTrust
+{
+
+    private final TrustPacket packet;
+
+    public PGPTrust(TrustPacket packet)
+    {
+        this.packet = packet;
+    }
+
+    public PGPTrust(BCPGInputStream inputStream)
+        throws IOException
+    {
+        this((TrustPacket) inputStream.readPacket());
+    }
+
+    public TrustPacket getPacket()
+    {
+        return packet;
+    }
+
+    public byte[] getLevelAndTrust()
+    {
+        return Arrays.copyOf(
+                packet.getLevelAndTrustAmount(),
+                packet.getLevelAndTrustAmount().length);
+    }
+}