summaryrefslogtreecommitdiff
path: root/Arbitrary.patch
blob: b86896d66eb6cf6bcf2e47075669c48998fd4af9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
--- Data/OpenPGP/Arbitrary.hs	2012-04-27 12:38:11.492411339 -0500
+++ arb.s	2012-04-27 12:37:57.176469214 -0500
@@ -19,8 +19,7 @@
                            x6 <- arbitrary
                            x7 <- arbitrary
                            x8 <- arbitrary
-                           x9 <- arbitrary
-                           return (SignaturePacket x1 x2 x3 x4 x5 x6 x7 x8 x9)
+                           return (signaturePacket x1 x2 x3 x4 x5 x6 x7 x8)
                    1 -> do x1 <- arbitrary
                            x2 <- arbitrary
                            x3 <- arbitrary
@@ -108,7 +107,7 @@
                    6 -> return AES192
                    7 -> return AES256
                    8 -> return Twofish
-                   9 -> do x1 <- arbitrary
+                   9 -> do x1 <- suchThat arbitrary (`notElem` [00,01,02,03,04,07,08,09,10])
                            return (SymmetricAlgorithm x1)
                    _ -> error "FATAL ERROR: Arbitrary instance, logic bug"

@@ -134,7 +133,7 @@

 instance Arbitrary MPI where
         arbitrary
-          = do x1 <- arbitrary
+          = do x1 <- suchThat arbitrary (>=0)
                return (MPI x1)


@@ -160,5 +160,5 @@
                            return (PreferredSymmetricAlgorithmsPacket x1)
                    8 -> do x1 <- arbitrary
                            x2 <- arbitrary
-                           x3 <- arbitrary
+                           x3 <- vectorOf 40 (elements (['0'..'9'] ++ ['A'..'F']))
                            return (RevocationKeyPacket x1 x2 x3)
@@ -166 +165 @@
-                   9 -> do x1 <- arbitrary
+                   9 -> do x1 <- vectorOf 16 (elements (['0'..'9'] ++ ['A'..'F']))
@@ -169,2 +168 @@
-                            x2 <- arbitrary
-                            return (UnsupportedSignatureSubpacket x1 x2)
+                            return (UnsupportedSignatureSubpacket 105 x1)