Put v2/3 signatures as well

Add trailer calculation for v2/3
Add code to put these packets back out
Change Arbitrary instance to allow for these kinds of signatures
Tests pass

1 files changed, 9 insertions, 2 deletions

diff --git a/Arbitrary.patch b/Arbitrary.patch
index f1f3824..fa78846 100644
--- a/Arbitrary.patch
+++ b/Arbitrary.patch
@@ -1,6 +1,6 @@
 --- 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,11 @@
+@@ -14,13 +14,18 @@
                     0 -> do x1 <- arbitrary
                             x2 <- arbitrary
                             x3 <- arbitrary
@@ -13,7 +13,14 @@
 -                           x8 <- arbitrary
 -                           x9 <- arbitrary
 -                           return (SignaturePacket x1 x2 x3 x4 x5 x6 x7 x8 x9)
-+                           return (signaturePacket 4 x1 x2 x3 x4 x5 x6 x7)
++                           version <- choose (2 :: Word8, 4)
++                           case version of
++                                   4 ->
++                                           return (signaturePacket 4 x1 x2 x3 x4 x5 x6 x7)
++                                   _ -> do
++                                           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
                             x2 <- arbitrary
                             x3 <- arbitrary