diff options
Diffstat (limited to 'Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs')
-rw-r--r-- | Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs index d08c3c1..c9c9641 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs | |||
@@ -7,13 +7,14 @@ module Codec.Encryption.OpenPGP.ASCIIArmor.Encode ( | |||
7 | armor | 7 | armor |
8 | ) where | 8 | ) where |
9 | 9 | ||
10 | import Codec.Encryption.OpenPGP.Serialize (putPackets) | 10 | import Codec.Encryption.OpenPGP.Serialize () |
11 | import Codec.Encryption.OpenPGP.Types | 11 | import Codec.Encryption.OpenPGP.Types |
12 | import Data.ByteString (ByteString) | 12 | import Data.ByteString (ByteString) |
13 | import qualified Data.ByteString as B | 13 | import qualified Data.ByteString as B |
14 | import qualified Data.ByteString.Char8 as BC8 | 14 | import qualified Data.ByteString.Char8 as BC8 |
15 | import qualified Data.ByteString.Base64 as Base64 | 15 | import qualified Data.ByteString.Base64 as Base64 |
16 | import Data.Digest.CRC24 (crc24) | 16 | import Data.Digest.CRC24 (crc24) |
17 | import Data.Serialize (put) | ||
17 | import Data.Serialize.Put (runPut, putWord32be) | 18 | import Data.Serialize.Put (runPut, putWord32be) |
18 | import Data.String (IsString, fromString) | 19 | import Data.String (IsString, fromString) |
19 | 20 | ||
@@ -44,7 +45,7 @@ armorHeaders ahs = BC8.unlines . map armorHeader $ ahs | |||
44 | armorHeader (k, v) = k `B.append` BC8.pack ": " `B.append` v | 45 | armorHeader (k, v) = k `B.append` BC8.pack ": " `B.append` v |
45 | 46 | ||
46 | opgpStream :: [Packet] -> ByteString | 47 | opgpStream :: [Packet] -> ByteString |
47 | opgpStream = runPut . putPackets | 48 | opgpStream = runPut . put . Block |
48 | 49 | ||
49 | armorData :: ByteString -> ByteString | 50 | armorData :: ByteString -> ByteString |
50 | armorData = BC8.unlines . wrap76 . Base64.encode | 51 | armorData = BC8.unlines . wrap76 . Base64.encode |