1 files changed, 11 insertions, 14 deletions

diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs
index c9c9641..8853be3 100644
--- a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs
+++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs
@@ -1,14 +1,13 @@
 -- ASCIIArmor/Encode.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.Encode (
    armor
 ) where
 
-import Codec.Encryption.OpenPGP.Serialize ()
-import Codec.Encryption.OpenPGP.Types
+import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BC8
@@ -19,7 +18,7 @@ import Data.Serialize.Put (runPut, putWord32be)
 import Data.String (IsString, fromString)
 
 armor :: (Integral a, Show a) => Armor a -> ByteString
-armor (Armor atype ahs ps) = beginLine atype `B.append` armorHeaders ahs `B.append` blankLine `B.append` armorData (opgpStream ps) `B.append` armorChecksum (opgpStream ps) `B.append` endLine atype
+armor (Armor atype ahs bs) = beginLine atype `B.append` armorHeaders ahs `B.append` blankLine `B.append` armorData bs `B.append` armorChecksum bs `B.append` endLine atype
 
 blankLine :: ByteString
 blankLine = BC8.singleton '\n'
@@ -38,22 +37,20 @@ aType (ArmorSplitMessage x y) = BC8.pack $ "MESSAGE, PART " ++ show x ++ "/" ++
 aType (ArmorSplitMessageIndefinite x) = BC8.pack $ "MESSAGE, PART " ++ show x
 aType (ArmorSignature) = BC8.pack "SIGNATURE"
 
-armorHeaders :: [ArmorHeader] -> ByteString
+armorHeaders :: [(String, String)] -> ByteString
 armorHeaders ahs = BC8.unlines . map armorHeader $ ahs
     where
-        armorHeader :: ArmorHeader -> ByteString
-        armorHeader (k, v) = k `B.append` BC8.pack ": " `B.append` v
-
-opgpStream :: [Packet] -> ByteString
-opgpStream = runPut . put . Block
+        armorHeader :: (String, String) -> ByteString
+        armorHeader (k, v) = BC8.pack k `B.append` BC8.pack ": " `B.append` BC8.pack v
 
 armorData :: ByteString -> ByteString
-armorData = BC8.unlines . wrap76 . Base64.encode
+armorData = BC8.unlines . wordWrap 64 . Base64.encode
 
-wrap76 :: ByteString -> [ByteString]
-wrap76 bs
+wordWrap :: Int -> ByteString -> [ByteString]
+wordWrap lw bs
     | B.null bs = []
-    | otherwise = B.take 76 bs : wrap76 (B.drop 76 bs)
+    | lw < 1 || lw > 76 = wordWrap 76 bs
+    | otherwise = B.take lw bs : wordWrap lw (B.drop lw bs)
 
 armorChecksum :: ByteString -> ByteString
 armorChecksum = BC8.cons '=' . armorData . B.tail . runPut . putWord32be . crc24