1 files changed, 18 insertions, 21 deletions

diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
index b1cc5c0..98934a0 100644
--- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
+++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
@@ -17,7 +17,6 @@ import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, s
 import qualified Data.Attoparsec.ByteString as AS
 import qualified Data.Attoparsec.ByteString.Lazy as AL
 import Data.Attoparsec.ByteString.Char8 (isDigit_w8, anyChar)
-import Data.Attoparsec.Combinator (manyTill)
 import Data.Bits (shiftL)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
@@ -25,23 +24,21 @@ import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Char8 as BC8
 import qualified Data.ByteString.Base64 as Base64
 import Data.Digest.CRC24 (crc24)
-import Data.Serialize (get)
 import Data.Serialize.Get (Get, runGet, getWord8)
-import Data.Serialize.Put (runPut, putWord32be)
 import Data.String (IsString, fromString)
 import Data.Word (Word32)
 
 decode :: IsString e => ByteString -> Either e [Armor]
 decode bs = go (AS.parse parseArmors bs)
     where
-        go (AS.Fail t c e) = Left (fromString e)
+        go (AS.Fail _ _ e) = Left (fromString e)
         go (AS.Partial cont) = go (cont B.empty)
         go (AS.Done _ r) = Right r
 
 decodeLazy :: IsString e => BL.ByteString -> Either e [Armor]
 decodeLazy bs = go (AL.parse parseArmors bs)
     where
-        go (AL.Fail t c e) = Left (fromString e)
+        go (AL.Fail _ _ e) = Left (fromString e)
         go (AL.Done _ r) = Right r
 
 parseArmors :: Parser [Armor]
@@ -52,10 +49,10 @@ parseArmor = prefixed (clearsigned <|> armor) <?> "armor"
 
 clearsigned :: Parser Armor
 clearsigned = do
-    string "-----BEGIN PGP SIGNED MESSAGE-----" <?> "clearsign header"
-    lineEnding <?> "line ending"
+    _ <- string "-----BEGIN PGP SIGNED MESSAGE-----" <?> "clearsign header"
+    _ <- lineEnding <?> "line ending"
     headers <- armorHeaders <?> "clearsign headers"
-    blankishLine <?> "blank line"
+    _ <- blankishLine <?> "blank line"
     cleartext <- dashEscapedCleartext
     sig <- armor
     return $ ClearSigned headers (BL.fromChunks [cleartext]) sig
@@ -64,18 +61,18 @@ armor :: Parser Armor
 armor = do
     atype <- beginLine <?> "begin line"
     headers <- armorHeaders <?> "headers"
-    blankishLine <?> "blank line"
+    _ <- blankishLine <?> "blank line"
     payload <- base64Data <?> "base64 data"
-    endLine atype <?> "end line"
+    _ <- endLine atype <?> "end line"
     return $ Armor atype headers (BL.fromChunks [payload])
 
 beginLine :: Parser ArmorType
 beginLine = do
-    string "-----BEGIN PGP " <?> "leading minus-hyphens"
+    _ <- string "-----BEGIN PGP " <?> "leading minus-hyphens"
     atype <- pubkey <|> privkey <|> parts <|> message <|> signature
-    string "-----" <?> "trailing minus-hyphens"
-    many (satisfy (inClass " \t")) <?> "whitespace"
-    lineEnding <?> "line ending"
+    _ <- string "-----" <?> "trailing minus-hyphens"
+    _ <- many (satisfy (inClass " \t")) <?> "whitespace"
+    _ <- lineEnding <?> "line ending"
     return atype
     where
         message = string "MESSAGE" *> return ArmorMessage
@@ -85,7 +82,7 @@ beginLine = do
         parts = string "MESSAGE, PART " *> (partsdef <|> partsindef)
         partsdef = do
             firstnum <- num
-            word8 (fromIntegral . fromEnum $ '/')
+            _ <- word8 (fromIntegral . fromEnum $ '/')
             secondnum <- num
             return $ ArmorSplitMessage (BL.pack firstnum) (BL.pack secondnum)
         partsindef = ArmorSplitMessageIndefinite . BL.pack <$> num
@@ -100,9 +97,9 @@ armorHeaders = many armorHeader
 armorHeader :: Parser (String, String)
 armorHeader = do
     key <- many1 (satisfy (inClass "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"))
-    string ": "
+    _ <- string ": "
     val <- many1 (satisfy (notInClass "\n\r"))
-    lineEnding
+    _ <- lineEnding
     return (w8sToString key, w8sToString val)
     where
         w8sToString = BC8.unpack . B.pack
@@ -112,7 +109,7 @@ blankishLine = many (satisfy (inClass " \t")) *> lineEnding
 
 endLine :: ArmorType -> Parser ByteString
 endLine atype = do
-    string $ "-----END PGP " `B.append` aType atype `B.append` "-----"
+    _ <- string $ "-----END PGP " `B.append` aType atype `B.append` "-----"
     lineEnding
 
 aType :: ArmorType -> ByteString
@@ -140,16 +137,16 @@ base64Data = do
         base64Line = do
                         b64 <- many1 (satisfy (inClass "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"))
                         pad <- many (word8 (fromIntegral . fromEnum $ '='))
-                        lineEnding
+                        _ <- lineEnding
                         let line = B.pack b64 `B.append` B.pack pad
                         case Base64.decode line of
                             Left err -> fail err
                             Right bs -> return bs
         checksumLine :: Parser ByteString
         checksumLine = do
-                        word8 (fromIntegral . fromEnum $ '=')
+                        _ <- word8 (fromIntegral . fromEnum $ '=')
                         b64 <- many1 (satisfy (inClass "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"))
-                        lineEnding
+                        _ <- lineEnding
                         let line = B.pack b64
                         case Base64.decode line of
                             Left err -> fail err