2 files changed, 7 insertions, 2 deletions

diff --git a/Arbitrary.patch b/Arbitrary.patch
index b003906..9c753cb 100644
--- a/Arbitrary.patch
+++ b/Arbitrary.patch
@@ -21,8 +21,8 @@
 
                     _ -> error "FATAL ERROR: Arbitrary instance, logic bug"
 @@ -140 +139 @@
--                   6 -> do x1 <- arbitrary
-+                   6 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)
+-                   7 -> do x1 <- arbitrary
++                   7 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)
 @@ -143,2 +142 @@
 -                           x2 <- arbitrary
 -                           return (UnsupportedSignatureSubpacket x1 x2)
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index b9a4836..acf5fb6 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -660,6 +660,7 @@ data SignatureSubpacket =
         TrustSignaturePacket {depth::Word8, trust::Word8} |
         RegularExpressionPacket String |
         RevocablePacket Bool |
+        KeyExpirationTimePacket Word32 | -- seconds after key CreationTime
         IssuerPacket String |
         UnsupportedSignatureSubpacket Word8 B.ByteString
         deriving (Show, Read, Eq)
@@ -705,6 +706,8 @@ put_signature_subpacket (RegularExpressionPacket regex) =
         (B.concat [B.fromString regex, B.singleton 0], 6)
 put_signature_subpacket (RevocablePacket exportable) =
         (encode $ enum_to_word8 exportable, 7)
+put_signature_subpacket (KeyExpirationTimePacket time) =
+        (encode time, 9)
 put_signature_subpacket (IssuerPacket keyid) =
         (encode (fst $ head $ readHex keyid :: Word64), 16)
 put_signature_subpacket (UnsupportedSignatureSubpacket tag bytes) =
@@ -726,6 +729,8 @@ parse_signature_subpacket  6 = fmap
 -- RevocablePacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.12
 parse_signature_subpacket  7 =
         fmap (RevocablePacket . enum_from_word8) get
+-- KeyExpirationTimePacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.6
+parse_signature_subpacket  9 = fmap KeyExpirationTimePacket get
 -- IssuerPacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.5
 parse_signature_subpacket 16 = do
         keyid <- get :: Get Word64