From f89d7cc984dd780159906dbd9f37371c057c467d Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 9 Jul 2019 17:00:53 -0400 Subject: redundant imports --- lib/KeyRing/BuildKeyDB.hs | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs index 2074ce3..afee71a 100644 --- a/lib/KeyRing/BuildKeyDB.hs +++ b/lib/KeyRing/BuildKeyDB.hs @@ -11,7 +11,6 @@ module KeyRing.BuildKeyDB where #if defined(VERSION_memory) import Data.ByteArray.Encoding -import qualified Data.ByteString.Char8 as S8 import qualified Data.ByteString as S #elif defined(VERSION_dataenc) import qualified Codec.Binary.Base32 as Base32 @@ -19,7 +18,6 @@ import qualified Codec.Binary.Base64 as Base64 #endif import qualified Codec.Encryption.OpenPGP.ASCIIArmor as ASCIIArmor import Codec.Encryption.OpenPGP.ASCIIArmor.Types -import Control.Applicative (liftA2) import Control.Arrow (first, second) import Control.Exception (catch) import Control.Monad @@ -27,52 +25,37 @@ import ControlMaybe (handleIO_) import Data.ASN1.BinaryEncoding (DER (..)) import Data.ASN1.Encoding (decodeASN1, encodeASN1) -import Data.ASN1.Types (ASN1 (BitString, End, IntVal, Null, OID, Start), - ASN1ConstructionType (Sequence), ASN1Object, - fromASN1, toASN1) +import Data.ASN1.Types (ASN1 (End, IntVal, Start), ASN1ConstructionType (Sequence), ASN1Object, fromASN1, toASN1) + + import Data.Binary -import Data.Bits ((.&.), (.|.)) -import Data.Bits (Bits, testBit) -import qualified Data.ByteString as S (ByteString, breakSubstring, - concat, drop, hGetContents, - hPutStr, length, null, - readFile, spanEnd, unpack) +import Data.Bits (testBit) import Data.ByteString.Lazy (ByteString) import qualified Data.ByteString.Lazy as L (ByteString, concat, empty, - fromChunks, hGetContents, - null, readFile, toChunks, + hGetContents, + null, toChunks, toStrict, head) import Data.Char -import Data.Function import Data.List import qualified Data.Map as Map import Data.Maybe -import Data.Monoid import Data.OpenPGP -import Data.OpenPGP.Util (GenerateKeyParams (..), - decryptSecretKey, fingerprint, - generateKey, pgpSign, verify) -import Data.Ord -import Data.Text.Encoding (encodeUtf8) +import Data.OpenPGP.Util (GenerateKeyParams (..), fingerprint, generateKey, pgpSign, verify) + + import Data.Time.Clock (UTCTime) import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds) import System.Directory (doesFileExist) import System.IO.Error (isDoesNotExistError) -import Text.Show.Pretty as PP (ppShow) #if !defined(VERSION_cryptonite) import qualified Crypto.Hash.SHA1 as SHA1 import qualified Crypto.Types.PubKey.ECC as ECC #else -import qualified Crypto.Hash as Vincent import qualified Crypto.PubKey.ECC.Types as ECC -import Data.ByteArray (convert) #endif import qualified Codec.Compression.GZip as GZip import qualified Crypto.PubKey.RSA as RSA -import qualified Data.Text as T (break, drop, dropAround, - length, pack, reverse, strip, - unpack) import qualified Data.X509 as X509 import System.Posix.Files (getFdStatus, getFileStatus, modificationTime) @@ -91,10 +74,9 @@ import Foreign.Marshal.Array (withArray) import Foreign.Ptr import Foreign.Storable #endif -import Data.IORef import Data.Traversable (sequenceA) import qualified Data.Traversable as Traversable -import System.IO (stderr,openFile,IOMode(ReadMode)) +import System.IO (openFile, IOMode(ReadMode)) import System.Posix.IO (fdToHandle) #if ! MIN_VERSION_base(4,6,0) -- cgit v1.2.3