Refactor verbose ==

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/OpenPGP.Crypto.hs b/lib/OpenPGP.Crypto.hs
index 3e23815..5d1475f 100644
--- a/lib/OpenPGP.Crypto.hs
+++ b/lib/OpenPGP.Crypto.hs
@@ -20,7 +20,7 @@ fingerprint :: OpenPGP.Packet -> String
 fingerprint p | OpenPGP.version p == 4 =
         BaseConvert.toString 16 $ SHA1.toInteger $ SHA1.hash $
                 LZ.unpack (LZ.concat (OpenPGP.fingerprint_material p))
-fingerprint p | OpenPGP.version p == 2 || OpenPGP.version p == 3 =
+fingerprint p | (OpenPGP.version p) `elem` [2, 3] =
         concat $ map (BaseConvert.toString 16) $
                 MD5.hash $ LZ.unpack (LZ.concat (OpenPGP.fingerprint_material p))
 
diff --git a/lib/OpenPGP.hs b/lib/OpenPGP.hs
index 231f351..94489c9 100644
--- a/lib/OpenPGP.hs
+++ b/lib/OpenPGP.hs
@@ -103,7 +103,7 @@ parse_new_length = do
                         second <- fmap fromIntegral (get :: Get Word8)
                         return $ ((len - 192) `shiftL` 8) + second + 192
                 -- Five octet length
-                _ | len == 255 -> get :: Get Word32
+                255 -> get :: Get Word32
                 -- TODO: Partial body lengths. 1 << (len & 0x1F)
 
 -- http://tools.ietf.org/html/rfc4880#section-4.2.1
@@ -232,11 +232,11 @@ parse_packet  5 = do
         s2k_useage <- get :: Get Word8
         let k = SecretKeyPacket version timestamp algorithm key s2k_useage
         k' <- case s2k_useage of
-                _ | s2k_useage == 255 || s2k_useage == 254 -> do
+                _ | s2k_useage `elem` [255, 254] -> do
                         symmetric_type <- get
                         s2k_type <- get
                         s2k_hash_algorithm <- get
-                        s2k_salt <- if s2k_type == 1 || s2k_type == 3 then get
+                        s2k_salt <- if s2k_type `elem` [1, 3] then get
                                 else return undefined
                         s2k_count <- if s2k_type == 3 then do
                                 c <- fmap fromIntegral (get :: Get Word8)
@@ -321,7 +321,7 @@ fingerprint_material (PublicKeyPacket {version = 4,
         ]
         where material = LZ.concat $
                 map (\f -> encode (key ! f)) (public_key_fields algorithm)
-fingerprint_material p | version p == 2 || version p == 3 = [n, e]
+fingerprint_material p | (version p) `elem` [2, 3] = [n, e]
         where n = LZ.drop 2 (encode (key p ! 'n'))
               e = LZ.drop 2 (encode (key p ! 'e'))