TrustSignaturePacket

2 files changed, 12 insertions, 6 deletions

diff --git a/Arbitrary.patch b/Arbitrary.patch
index 28bd37e..e82de3d 100644
--- a/Arbitrary.patch
+++ b/Arbitrary.patch
@@ -19,14 +19,14 @@
                 return (MPI x1)
 
 
-@@ -133,9 +132,8 @@
-                    3 -> do x1 <- arbitrary
-                            x2 <- arbitrary
+@@ -135,9 +134,8 @@
                             return (TrustSignaturePacket x1 x2)
--                   4 -> do x1 <- arbitrary
-+                   4 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)
+                    4 -> do x1 <- arbitrary
+                            return (RegularExpressionPacket x1)
+-                   5 -> do x1 <- arbitrary
++                   5 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)
                             return (IssuerPacket x1)
-                    5 -> do x1 <- arbitrary
+                    6 -> do x1 <- arbitrary
 -                           x2 <- arbitrary
 -                           return (UnsupportedSignatureSubpacket x1 x2)
 +                           return (UnsupportedSignatureSubpacket 105 x1)
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index 63d4dc1..1fc3192 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -658,6 +658,7 @@ data SignatureSubpacket =
         SignatureExpirationTimePacket Word32 | -- seconds after CreationTime
         ExportableCertificationPacket Bool |
         TrustSignaturePacket {depth::Word8, trust::Word8} |
+        RegularExpressionPacket String |
         IssuerPacket String |
         UnsupportedSignatureSubpacket Word8 B.ByteString
         deriving (Show, Read, Eq)
@@ -699,6 +700,8 @@ put_signature_subpacket (ExportableCertificationPacket exportable) =
         (encode $ enum_to_word8 exportable, 4)
 put_signature_subpacket (TrustSignaturePacket depth trust) =
         (B.concat [encode depth, encode trust], 5)
+put_signature_subpacket (RegularExpressionPacket regex) =
+        (B.concat [B.fromString regex, B.singleton 0], 6)
 put_signature_subpacket (IssuerPacket keyid) =
         (encode (fst $ head $ readHex keyid :: Word64), 16)
 put_signature_subpacket (UnsupportedSignatureSubpacket tag bytes) =
@@ -715,6 +718,9 @@ parse_signature_subpacket  4 =
 -- TrustSignaturePacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.13
 parse_signature_subpacket  5 =
         liftM2 TrustSignaturePacket get get
+-- TrustSignaturePacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.14
+parse_signature_subpacket  6 = fmap
+        (RegularExpressionPacket . B.toString . B.init) getRemainingByteString
 -- IssuerPacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.5
 parse_signature_subpacket 16 = do
         keyid <- get :: Get Word64