AsymmetricSessionKeyPacket

2 files changed, 23 insertions, 2 deletions

diff --git a/Arbitrary.patch b/Arbitrary.patch
index fa78846..641609f 100644
--- a/Arbitrary.patch
+++ b/Arbitrary.patch
@@ -1,7 +1,7 @@
 --- Data/OpenPGP/Arbitrary.hs   2012-04-27 12:38:11.492411339 -0500
 +++ arb.s       2012-04-27 12:37:57.176469214 -0500
 @@ -14,13 +14,18 @@
-                    0 -> do x1 <- arbitrary
+                    1 -> do x1 <- arbitrary
                             x2 <- arbitrary
                             x3 <- arbitrary
 -                           x4 <- arbitrary
@@ -21,7 +21,7 @@
 +                                           creation_time <- arbitrary
 +                                           keyid <- vectorOf 16 (elements (['0'..'9'] ++ ['A'..'F']))
 +                                           return (signaturePacket version x1 x2 x3 [] [SignatureCreationTimePacket creation_time, IssuerPacket keyid] x6 x7)
-                    1 -> do x1 <- arbitrary
+                    2 -> do x1 <- arbitrary
                             x2 <- arbitrary
                             x3 <- arbitrary
 @@ -73,7 +72,7 @@
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index c9a7840..dca7838 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -6,6 +6,7 @@
 -- > import qualified Data.OpenPGP as OpenPGP
 module Data.OpenPGP (
         Packet(
+                AsymmetricSessionKeyPacket,
                 OnePassSignaturePacket,
                 PublicKeyPacket,
                 SecretKeyPacket,
@@ -63,6 +64,7 @@ module Data.OpenPGP (
 import Numeric
 import Control.Monad
 import Control.Arrow
+import Control.Applicative
 import Control.Exception (assert)
 import Data.Bits
 import Data.Word
@@ -155,6 +157,12 @@ pad :: Int -> String -> String
 pad l s = replicate (l - length s) '0' ++ s
 
 data Packet =
+        AsymmetricSessionKeyPacket {
+                version::Word8,
+                key_id::String,
+                key_algorithm::KeyAlgorithm,
+                encrypted_data::B.ByteString
+        } |
         SignaturePacket {
                 version::Word8,
                 signature_type::Word8,
@@ -339,6 +347,13 @@ calculate_signature_trailer x =
         error ("Trying to calculate signature trailer for: " ++ show x)
 
 put_packet :: Packet -> (B.ByteString, Word8)
+put_packet (AsymmetricSessionKeyPacket version key_id key_algorithm dta) =
+        (B.concat [
+                encode version,
+                encode (fst $ head $ readHex key_id :: Word64),
+                encode key_algorithm,
+                dta
+        ], 1)
 put_packet (SignaturePacket { version = v,
                               unhashed_subpackets = unhashed_subpackets,
                               key_algorithm = key_algorithm,
@@ -456,6 +471,12 @@ put_packet (UnsupportedPacket tag bytes) = (bytes, fromIntegral tag)
 put_packet x = error ("Unsupported Packet version or type in put_packet: " ++ show x)
 
 parse_packet :: Word8 -> Get Packet
+-- AsymmetricSessionKeyPacket, http://tools.ietf.org/html/rfc4880#section-5.1
+parse_packet  1 = AsymmetricSessionKeyPacket
+        <$> fmap (assertProp (==3)) get
+        <*> fmap (pad 16 . map toUpper . flip showHex "") (get :: Get Word64)
+        <*> get
+        <*> getRemainingByteString
 -- SignaturePacket, http://tools.ietf.org/html/rfc4880#section-5.2
 parse_packet  2 = do
         version <- get