1 files changed, 16 insertions, 7 deletions

diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
index b89fbfa..bfaef39 100644
--- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
+++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
@@ -7,12 +7,15 @@
 module Codec.Encryption.OpenPGP.ASCIIArmor.Decode (
    parseArmor
  , decode
+ , decodeLazy
 ) where
 
 import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 import Codec.Encryption.OpenPGP.ASCIIArmor.Utils
 import Control.Applicative (many, (<|>), (<$>), Alternative, (<*), (<*>), (*>), optional)
-import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, satisfy, word8, (<?>), parse, IResult(..))
+import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, satisfy, word8, (<?>))
+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)
@@ -29,11 +32,17 @@ import Data.String (IsString, fromString)
 import Data.Word (Word32)
 
 decode :: IsString e => ByteString -> Either e [Armor]
-decode bs = go (parse parseArmors bs)
+decode bs = go (AS.parse parseArmors bs)
     where
-        go (Fail t c e) = Left (fromString e)
-        go (Partial cont) = go (cont B.empty)
-        go (Done _ r) = Right r
+        go (AS.Fail t c 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.Done _ r) = Right r
 
 parseArmors :: Parser [Armor]
 parseArmors = many parseArmor
@@ -110,8 +119,8 @@ aType :: ArmorType -> ByteString
 aType (ArmorMessage) = BC8.pack "MESSAGE"
 aType (ArmorPublicKeyBlock) = BC8.pack "PUBLIC KEY BLOCK"
 aType (ArmorPrivateKeyBlock) = BC8.pack "PRIVATE KEY BLOCK"
-aType (ArmorSplitMessage x y) = BC8.pack "MESSAGE, PART " `B.append` (l2s x) `B.append` BC8.singleton '/' `B.append` (l2s y)
-aType (ArmorSplitMessageIndefinite x) = BC8.pack "MESSAGE, PART " `B.append` (l2s x)
+aType (ArmorSplitMessage x y) = BC8.pack "MESSAGE, PART " `B.append` l2s x `B.append` BC8.singleton '/' `B.append` l2s y
+aType (ArmorSplitMessageIndefinite x) = BC8.pack "MESSAGE, PART " `B.append` l2s x
 aType (ArmorSignature) = BC8.pack "SIGNATURE"
 
 l2s :: BL.ByteString -> ByteString