diff options
author | Stephen Paul Weber <singpolyma@singpolyma.net> | 2011-08-08 21:47:10 -0500 |
---|---|---|
committer | Stephen Paul Weber <singpolyma@singpolyma.net> | 2011-08-08 21:55:19 -0500 |
commit | aa8529550515d2a1a59adff2fc5dbd4235b92f18 (patch) | |
tree | 410163c8b8972f64a9fb838b8d0e89ef0c975661 | |
parent | cf528d91c534e71cf9fed06620ccd3d2fe3197b7 (diff) |
Move into Data hierarchy
-rw-r--r-- | Data/BaseConvert.hs (renamed from lib/BaseConvert.hs) | 2 | ||||
-rw-r--r-- | Data/OpenPGP.hs (renamed from lib/OpenPGP.hs) | 6 | ||||
-rw-r--r-- | Data/OpenPGP/Crypto.hs (renamed from lib/OpenPGP.Crypto.hs) | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/BaseConvert.hs b/Data/BaseConvert.hs index 1f5c040..655f593 100644 --- a/lib/BaseConvert.hs +++ b/Data/BaseConvert.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | module BaseConvert (toString, toNum, toAlphaDigit, fromAlphaDigit) where | 1 | module Data.BaseConvert (toString, toNum, toAlphaDigit, fromAlphaDigit) where |
2 | 2 | ||
3 | import Data.Sequence | 3 | import Data.Sequence |
4 | import Data.Foldable (toList) | 4 | import Data.Foldable (toList) |
diff --git a/lib/OpenPGP.hs b/Data/OpenPGP.hs index 55fd3fc..1c76202 100644 --- a/lib/OpenPGP.hs +++ b/Data/OpenPGP.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | module OpenPGP (Message(..), Packet(..), SignatureSubpacket(..), HashAlgorithm(..), KeyAlgorithm(..), CompressionAlgorithm(..), MPI(..), fingerprint_material, signatures_and_data, signature_issuer) where | 1 | module Data.OpenPGP (Message(..), Packet(..), SignatureSubpacket(..), HashAlgorithm(..), KeyAlgorithm(..), CompressionAlgorithm(..), MPI(..), fingerprint_material, signatures_and_data, signature_issuer) where |
2 | 2 | ||
3 | import Control.Monad | 3 | import Control.Monad |
4 | import Data.Bits | 4 | import Data.Bits |
@@ -15,7 +15,7 @@ import qualified Codec.Compression.Zlib.Raw as Zip | |||
15 | import qualified Codec.Compression.Zlib as Zlib | 15 | import qualified Codec.Compression.Zlib as Zlib |
16 | import qualified Codec.Compression.BZip as BZip2 | 16 | import qualified Codec.Compression.BZip as BZip2 |
17 | 17 | ||
18 | import qualified BaseConvert as BaseConvert | 18 | import qualified Data.BaseConvert as BaseConvert |
19 | 19 | ||
20 | data Packet = | 20 | data Packet = |
21 | SignaturePacket { | 21 | SignaturePacket { |
@@ -535,7 +535,7 @@ instance Binary SignatureSubpacket where | |||
535 | packet <- getLazyByteString len | 535 | packet <- getLazyByteString len |
536 | return $ runGet (parse_signature_subpacket tag) packet | 536 | return $ runGet (parse_signature_subpacket tag) packet |
537 | 537 | ||
538 | signature_issuer :: OpenPGP.Packet -> Maybe String | 538 | signature_issuer :: Packet -> Maybe String |
539 | signature_issuer (SignaturePacket {hashed_subpackets = hashed, | 539 | signature_issuer (SignaturePacket {hashed_subpackets = hashed, |
540 | unhashed_subpackets = unhashed}) = | 540 | unhashed_subpackets = unhashed}) = |
541 | if (length issuers) > 0 then Just issuer else Nothing | 541 | if (length issuers) > 0 then Just issuer else Nothing |
diff --git a/lib/OpenPGP.Crypto.hs b/Data/OpenPGP/Crypto.hs index 240919d..e2151fc 100644 --- a/lib/OpenPGP.Crypto.hs +++ b/Data/OpenPGP/Crypto.hs | |||
@@ -1,4 +1,4 @@ | |||
1 | module OpenPGP.Crypto (verify, fingerprint) where | 1 | module Data.OpenPGP.Crypto (verify, fingerprint) where |
2 | 2 | ||
3 | import Data.Word | 3 | import Data.Word |
4 | import Data.Map ((!)) | 4 | import Data.Map ((!)) |
@@ -12,8 +12,8 @@ import qualified Data.Digest.SHA256 as SHA256 | |||
12 | import qualified Data.Digest.SHA384 as SHA384 | 12 | import qualified Data.Digest.SHA384 as SHA384 |
13 | import qualified Data.Digest.SHA512 as SHA512 | 13 | import qualified Data.Digest.SHA512 as SHA512 |
14 | 14 | ||
15 | import qualified OpenPGP as OpenPGP | 15 | import qualified Data.OpenPGP as OpenPGP |
16 | import qualified BaseConvert as BaseConvert | 16 | import qualified Data.BaseConvert as BaseConvert |
17 | 17 | ||
18 | -- http://tools.ietf.org/html/rfc4880#section-12.2 | 18 | -- http://tools.ietf.org/html/rfc4880#section-12.2 |
19 | fingerprint :: OpenPGP.Packet -> String | 19 | fingerprint :: OpenPGP.Packet -> String |