1 files changed, 23 insertions, 63 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index f8e2290..bd6de27 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -28,36 +28,24 @@ module KeyRing (module KeyRing.Types, module Transforms, module PacketTranscoder
 
 import System.Environment
 import Control.Monad
-import Control.Exception ( catch )
-import System.IO.Error ( isDoesNotExistError )
 import Data.Bool
 import Data.Maybe
 import Data.Either
 import Data.Char
-import Data.Ord
 import Data.List
 import Data.OpenPGP
-import Data.Functor
-import Data.Monoid
-import Data.Tuple             ( swap )
-import Data.Bits              ( (.|.), (.&.) )
-import Control.Applicative    ( Applicative, pure, liftA2, (<*>) )
 import System.Directory       ( getHomeDirectory, doesFileExist, createDirectoryIfMissing )
 import Control.Arrow          ( first, second )
 import Data.OpenPGP.Util
 import Data.ByteString.Lazy   ( ByteString )
-import Text.Show.Pretty as PP ( ppShow )
 import Data.Binary {- decode, decodeOrFail -}
 import ControlMaybe ( handleIO_ )
 import Data.ASN1.Types ( toASN1, ASN1Object, fromASN1
        , ASN1(Start,End,IntVal,OID,BitString,Null), ASN1ConstructionType(Sequence) )
 import Data.ASN1.BitArray ( BitArray(..), toBitArray )
-import Data.ASN1.Encoding ( encodeASN1, encodeASN1', decodeASN1, decodeASN1' )
+import Data.ASN1.Encoding (decodeASN1', encodeASN1, encodeASN1' )
 import Data.ASN1.BinaryEncoding ( DER(..) )
-import Data.Time.Clock.POSIX ( POSIXTime, utcTimeToPOSIXSeconds )
-import Data.Time.Clock ( UTCTime )
-import Data.Bits ( Bits, shiftR )
-import Data.Text.Encoding ( encodeUtf8 )
+import Data.Bits ((.&.), shiftR )
 import qualified Data.Map as Map
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString      as S
@@ -72,25 +60,15 @@ import qualified Codec.Binary.Base64 as Base64
 import qualified Crypto.Hash.SHA1 as SHA1
 import qualified Crypto.Types.PubKey.ECC as ECC
 #else
-import qualified Crypto.Hash as Vincent
-import Data.ByteArray (convert)
-import qualified Crypto.PubKey.ECC.Types as ECC
 #endif
-import qualified Data.X509 as X509
-import qualified Crypto.PubKey.RSA as RSA
 import qualified Codec.Compression.GZip as GZip
-import qualified Data.Text as T ( Text, unpack, pack,
-        strip, reverse, drop, break, dropAround, length )
 import qualified System.Posix.Types as Posix
-import System.Posix.Files ( modificationTime, getFileStatus, getFdStatus
-        , setFileCreationMask, setFileTimes )
+import System.Posix.Files (setFileCreationMask, setFileTimes )
+
 #if MIN_VERSION_x509(1,5,0)
-import Data.Hourglass.Types
-import Data.Hourglass
 #endif
 #if MIN_VERSION_unix(2,7,0)
 import System.Posix.Files ( setFdTimesHiRes )
-import Foreign.C.Types ( CTime(..), CLong, CInt(..) )
 #else
 import Foreign.C.Types ( CTime(..), CLong, CInt(..) )
 import Foreign.Marshal.Array ( withArray )
@@ -100,59 +78,41 @@ import Foreign.Storable
 #endif
 import System.FilePath ( takeDirectory )
 import System.IO (hPutStrLn,withFile,IOMode(..), Handle, hPutStr, stderr, hClose)
-import Data.IORef
 import System.Posix.IO ( fdToHandle )
-import qualified Data.Traversable as Traversable
-import Data.Traversable ( sequenceA )
 #if ! MIN_VERSION_base(4,6,0)
 import GHC.Exts ( Down(..) )
 #endif
 #if MIN_VERSION_binary(0,7,0)
-import Debug.Trace
 #endif
-import Network.Socket -- (SockAddr)
 import qualified Data.ByteString.Lazy.Char8 as Char8
 import qualified Codec.Encryption.OpenPGP.ASCIIArmor as ASCIIArmor
 import Codec.Encryption.OpenPGP.ASCIIArmor.Types
 
-import Compat
-import TimeUtil
-import PEM
-import ScanningParser
 import qualified Hosts
 import qualified CryptoCoins
 import Base58
 import FunctorToMaybe
 import DotLock
 import ProcessUtils (systemEnv, ExitCode(ExitFailure, ExitSuccess) )
-import GnuPGAgent as Agent
-import           KeyRing.BuildKeyDB {-         (accBindings, backsig, buildKeyDB,
-                                             combineTransforms, concatSort,
-                                             derRSA, derToBase32, filterMatches,
-                                             findTag, fingerdress,
-                                             flattenAllUids, flattenKeys,
-                                             flattenSub, flattenTop,
-                                             generateInternals, getBindings,
-                                             getHostnames, getSubkeys,
-                                             importSecretKey, insertSubkey,
-                                             isKey, isSecretKey,
-                                             isSubkeySignature, isUserID,
-                                             keyFlags0, keyPacket, keyflags,
-                                             keykey, mappedPacket, matchSpec,
-                                             matchpr, merge, mergeKeyPacket,
-                                             mkUsage, origin,
-                                             packetFromPublicRSAKey,
-                                             parseCertBlob, parseSingleSpec,
-                                             parseSpec, parseUID,
-                                             performManipulations,
-                                             readInputFileL, readSecretPEMFile,
-                                             resolveForReport, resolveInputFile,
-                                             rsaKeyFromPacket, secp256k1_id,
-                                             secretToPublic, seek_key,
-                                             selectKey0, selectPublicKey,
-                                             showPacket, sortByHint,
-                                             subkeyMappedPacket, torhash,
-                                             usageFromFilter) -}
+import           KeyRing.BuildKeyDB          (Hostnames(..),
+                                              IPsToWriteToHostsFile(..),
+                                              buildKeyDB,
+                                              combineTransforms,
+                                              filterMatches,
+                                              fingerdress, flattenKeys,
+                                              generateInternals,
+                                              getHostnames, getSubkeys,
+                                              importSecretKey,
+                                              insertSubkey,
+                                              matchSpec, merge,
+                                              packetFromPublicRSAKey,
+                                              parseCertBlob,
+                                              parseSingleSpec,
+                                              parseSpec, readInputFileL,
+                                              readSecretPEMFile,
+                                              secp256k1_id, seek_key,
+                                              selectKey0, selectPublicKey,
+                                              usageFromFilter)
 
 import KeyRing.Types
 import PacketTranscoder