packet: support reading keys

Author: csssuf

src/packet.rs

@@ -5,6 +5,7 @@ use nom::Err as NomErr;
 use nom::IResult;
 
 use compression::*;
+use key::*;
 use literal::*;
 use marker;
 use signature::*;
@@ -99,16 +100,16 @@ pub enum Packet {
     Signature(SignaturePacket),
     SymmetricKeySessionKey,
     OnePassSignature,
-    SecretKey,
-    PublicKey,
-    SecretSubkey,
+    SecretKey(Key),
+    PublicKey(Key),
+    SecretSubkey(Key),
     CompressedData(CompressedDataPacket),
     SymmetricEncryptedData,
     Marker,
     LiteralData(LiteralPacket),
     Trust,
     UserId(String),
-    PublicSubkey,
+    PublicSubkey(Key),
     UserAttribute,
     SymmetricEncryptedIntegrityProtectedData,
     ModificationDetectionCode,
@@ -121,16 +122,16 @@ impl Packet {
             Packet::Signature(_) => 2,
             Packet::SymmetricKeySessionKey => 3,
             Packet::OnePassSignature => 4,
-            Packet::SecretKey => 5,
-            Packet::PublicKey => 6,
-            Packet::SecretSubkey => 7,
+            Packet::SecretKey(_) => 5,
+            Packet::PublicKey(_) => 6,
+            Packet::SecretSubkey(_) => 7,
             Packet::CompressedData(_) => 8,
             Packet::SymmetricEncryptedData => 9,
             Packet::Marker => 10,
             Packet::LiteralData(_) => 11,
             Packet::Trust => 12,
             Packet::UserId(_) => 13,
-            Packet::PublicSubkey => 14,
+            Packet::PublicSubkey(_) => 14,
             Packet::UserAttribute => 17,
             Packet::SymmetricEncryptedIntegrityProtectedData => 18,
             Packet::ModificationDetectionCode => 19,
@@ -198,9 +199,9 @@ impl Packet {
             2 => Packet::Signature(SignaturePacket::from_bytes(packet_data)?),
             3 => Packet::SymmetricKeySessionKey,
             4 => Packet::OnePassSignature,
-            5 => Packet::SecretKey,
-            6 => Packet::PublicKey,
-            7 => Packet::SecretSubkey,
+            5 => Packet::SecretKey(Key::from_bytes(packet_data, false)?),
+            6 => Packet::PublicKey(Key::from_bytes(packet_data, false)?),
+            7 => Packet::SecretSubkey(Key::from_bytes(packet_data, true)?),
             8 => Packet::CompressedData(CompressedDataPacket::from_bytes(packet_data)?),
             9 => Packet::SymmetricEncryptedData,
             10 => {
@@ -210,7 +211,7 @@ impl Packet {
             11 => Packet::LiteralData(LiteralPacket::from_bytes(packet_data)?),
             12 => Packet::Trust,
             13 => Packet::UserId(userid::parse_userid(packet_data)?),
-            14 => Packet::PublicSubkey,
+            14 => Packet::PublicSubkey(Key::from_bytes(packet_data, true)?),
             17 => Packet::UserAttribute,
             18 => Packet::SymmetricEncryptedIntegrityProtectedData,
             19 => Packet::ModificationDetectionCode,