summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Paul Weber <singpolyma@singpolyma.net>2011-08-08 21:47:10 -0500
committerStephen Paul Weber <singpolyma@singpolyma.net>2011-08-08 21:55:19 -0500
commitaa8529550515d2a1a59adff2fc5dbd4235b92f18 (patch)
tree410163c8b8972f64a9fb838b8d0e89ef0c975661
parentcf528d91c534e71cf9fed06620ccd3d2fe3197b7 (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 @@
1module BaseConvert (toString, toNum, toAlphaDigit, fromAlphaDigit) where 1module Data.BaseConvert (toString, toNum, toAlphaDigit, fromAlphaDigit) where
2 2
3import Data.Sequence 3import Data.Sequence
4import Data.Foldable (toList) 4import 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 @@
1module OpenPGP (Message(..), Packet(..), SignatureSubpacket(..), HashAlgorithm(..), KeyAlgorithm(..), CompressionAlgorithm(..), MPI(..), fingerprint_material, signatures_and_data, signature_issuer) where 1module Data.OpenPGP (Message(..), Packet(..), SignatureSubpacket(..), HashAlgorithm(..), KeyAlgorithm(..), CompressionAlgorithm(..), MPI(..), fingerprint_material, signatures_and_data, signature_issuer) where
2 2
3import Control.Monad 3import Control.Monad
4import Data.Bits 4import Data.Bits
@@ -15,7 +15,7 @@ import qualified Codec.Compression.Zlib.Raw as Zip
15import qualified Codec.Compression.Zlib as Zlib 15import qualified Codec.Compression.Zlib as Zlib
16import qualified Codec.Compression.BZip as BZip2 16import qualified Codec.Compression.BZip as BZip2
17 17
18import qualified BaseConvert as BaseConvert 18import qualified Data.BaseConvert as BaseConvert
19 19
20data Packet = 20data 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
538signature_issuer :: OpenPGP.Packet -> Maybe String 538signature_issuer :: Packet -> Maybe String
539signature_issuer (SignaturePacket {hashed_subpackets = hashed, 539signature_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 @@
1module OpenPGP.Crypto (verify, fingerprint) where 1module Data.OpenPGP.Crypto (verify, fingerprint) where
2 2
3import Data.Word 3import Data.Word
4import Data.Map ((!)) 4import Data.Map ((!))
@@ -12,8 +12,8 @@ import qualified Data.Digest.SHA256 as SHA256
12import qualified Data.Digest.SHA384 as SHA384 12import qualified Data.Digest.SHA384 as SHA384
13import qualified Data.Digest.SHA512 as SHA512 13import qualified Data.Digest.SHA512 as SHA512
14 14
15import qualified OpenPGP as OpenPGP 15import qualified Data.OpenPGP as OpenPGP
16import qualified BaseConvert as BaseConvert 16import 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
19fingerprint :: OpenPGP.Packet -> String 19fingerprint :: OpenPGP.Packet -> String