1 files changed, 8 insertions, 9 deletions

diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
index 64f7236..8c2a8a3 100644
--- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
+++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 -- ASCIIArmor/Decode.hs: OpenPGP (RFC4880) ASCII armor implementation
 -- Copyright Ⓒ 2012  Clint Adams
--- This software is released under the terms of the Expat (MIT) license.
+-- This software is released under the terms of the ISC license.
 -- (See the LICENSE file).
 
 module Codec.Encryption.OpenPGP.ASCIIArmor.Decode (
@@ -9,8 +9,7 @@ module Codec.Encryption.OpenPGP.ASCIIArmor.Decode (
  , decodeArmor
 ) where
 
-import Codec.Encryption.OpenPGP.Serialize ()
-import Codec.Encryption.OpenPGP.Types
+import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 import Control.Applicative (many, (<|>), (<$>))
 import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, satisfy, word8, (<?>), parse, IResult(..))
 import Data.Attoparsec.ByteString.Char8 (isDigit_w8)
@@ -39,9 +38,7 @@ parseArmor = do
     blankishLine <?> "blank line"
     payload <- base64Data <?> "base64 data"
     endLine atype <?> "end line"
-    case runGet get payload of
-        Left err -> fail err
-        Right packets -> return $ Armor atype headers (unBlock packets)
+    return $ Armor atype headers payload
 
 beginLine :: (Integral a, Read a, Show a) => Parser (ArmorType a)
 beginLine = do
@@ -64,16 +61,18 @@ beginLine = do
 lineEnding :: Parser ByteString
 lineEnding = string "\n" <|> string "\r\n"
 
-armorHeaders :: Parser [ArmorHeader]
+armorHeaders :: Parser [(String, String)]
 armorHeaders = many armorHeader
 
-armorHeader :: Parser ArmorHeader
+armorHeader :: Parser (String, String)
 armorHeader = do
     key <- many1 (satisfy (inClass "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"))
     string ": "
     val <- many1 (satisfy (notInClass "\n\r"))
     lineEnding
-    return (B.pack key, B.pack val)
+    return (w8sToString key, w8sToString val)
+    where
+        w8sToString = BC8.unpack . B.pack
 
 blankishLine ::  Parser ByteString
 blankishLine = many (satisfy (inClass " \t")) >> lineEnding