diff options
Diffstat (limited to 'Codec/Encryption/OpenPGP')
-rw-r--r-- | Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs | 7 | ||||
-rw-r--r-- | Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs index 2383ff3..64f7236 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs | |||
@@ -9,7 +9,7 @@ module Codec.Encryption.OpenPGP.ASCIIArmor.Decode ( | |||
9 | , decodeArmor | 9 | , decodeArmor |
10 | ) where | 10 | ) where |
11 | 11 | ||
12 | import Codec.Encryption.OpenPGP.Serialize (getPackets) | 12 | import Codec.Encryption.OpenPGP.Serialize () |
13 | import Codec.Encryption.OpenPGP.Types | 13 | import Codec.Encryption.OpenPGP.Types |
14 | import Control.Applicative (many, (<|>), (<$>)) | 14 | import Control.Applicative (many, (<|>), (<$>)) |
15 | import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, satisfy, word8, (<?>), parse, IResult(..)) | 15 | import Data.Attoparsec.ByteString (Parser, many1, string, inClass, notInClass, satisfy, word8, (<?>), parse, IResult(..)) |
@@ -20,6 +20,7 @@ import qualified Data.ByteString as B | |||
20 | import qualified Data.ByteString.Char8 as BC8 | 20 | import qualified Data.ByteString.Char8 as BC8 |
21 | import qualified Data.ByteString.Base64 as Base64 | 21 | import qualified Data.ByteString.Base64 as Base64 |
22 | import Data.Digest.CRC24 (crc24) | 22 | import Data.Digest.CRC24 (crc24) |
23 | import Data.Serialize (get) | ||
23 | import Data.Serialize.Get (Get, runGet, getWord8) | 24 | import Data.Serialize.Get (Get, runGet, getWord8) |
24 | import Data.Serialize.Put (runPut, putWord32be) | 25 | import Data.Serialize.Put (runPut, putWord32be) |
25 | import Data.String (IsString, fromString) | 26 | import Data.String (IsString, fromString) |
@@ -38,9 +39,9 @@ parseArmor = do | |||
38 | blankishLine <?> "blank line" | 39 | blankishLine <?> "blank line" |
39 | payload <- base64Data <?> "base64 data" | 40 | payload <- base64Data <?> "base64 data" |
40 | endLine atype <?> "end line" | 41 | endLine atype <?> "end line" |
41 | case runGet getPackets payload of | 42 | case runGet get payload of |
42 | Left err -> fail err | 43 | Left err -> fail err |
43 | Right packets -> return $ Armor atype headers packets | 44 | Right packets -> return $ Armor atype headers (unBlock packets) |
44 | 45 | ||
45 | beginLine :: (Integral a, Read a, Show a) => Parser (ArmorType a) | 46 | beginLine :: (Integral a, Read a, Show a) => Parser (ArmorType a) |
46 | beginLine = do | 47 | beginLine = do |
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 |