PreferredCompressionAlgorithms

2 files changed, 15 insertions, 0 deletions

diff --git a/Arbitrary.patch b/Arbitrary.patch
index aa51d2d..0c2175d 100644
--- a/Arbitrary.patch
+++ b/Arbitrary.patch
@@ -28,6 +28,15 @@
                             return (SymmetricAlgorithm x1)
                     _ -> error "FATAL ERROR: Arbitrary instance, logic bug"
 
+@@ -121,7 +120,7 @@
+                    1 -> return ZIP
+                    2 -> return ZLIB
+                    3 -> return BZip2
+-                   4 -> do x1 <- arbitrary
++                   4 -> do x1 <- suchThat arbitrary (`notElem` [0,1,2,3])
+                            return (CompressionAlgorithm x1)
+                    _ -> error "FATAL ERROR: Arbitrary instance, logic bug"
+
 @@ -134,7 +133,7 @@
 
  instance Arbitrary MPI where
diff --git a/Data/OpenPGP.hs b/Data/OpenPGP.hs
index 051bd5d..41a5d4e 100644
--- a/Data/OpenPGP.hs
+++ b/Data/OpenPGP.hs
@@ -706,6 +706,7 @@ data SignatureSubpacket =
                 notation_value::String
         } |
         PreferredHashAlgorithmsPacket [HashAlgorithm] |
+        PreferredCompressionAlgorithmsPacket [CompressionAlgorithm] |
         UnsupportedSignatureSubpacket Word8 B.ByteString
         deriving (Show, Read, Eq)
 
@@ -776,6 +777,8 @@ put_signature_subpacket (NotationDataPacket human_readable name value) =
         flag1 = if human_readable then 0x80 else 0x0
 put_signature_subpacket (PreferredHashAlgorithmsPacket algos) =
         (B.concat $ map encode algos, 21)
+put_signature_subpacket (PreferredCompressionAlgorithmsPacket algos) =
+        (B.concat $ map encode algos, 22)
 put_signature_subpacket (UnsupportedSignatureSubpacket tag bytes) =
         (bytes, tag)
 
@@ -839,6 +842,9 @@ parse_signature_subpacket 20 = do
 -- PreferredHashAlgorithmsPacket, http://tools.ietf.org/html/rfc4880#section-5.2.3.8
 parse_signature_subpacket 21 =
         fmap PreferredHashAlgorithmsPacket listUntilEnd
+-- PreferredCompressionAlgorithms, http://tools.ietf.org/html/rfc4880#section-5.2.3.9
+parse_signature_subpacket 22 =
+        fmap PreferredCompressionAlgorithmsPacket listUntilEnd
 -- Represent unsupported packets as their tag and literal bytes
 parse_signature_subpacket tag =
         fmap (UnsupportedSignatureSubpacket tag) getRemainingByteString