1 files changed, 2 insertions, 46 deletions

diff --git a/kiki.hs b/kiki.hs
index f265add..d903b0f 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -81,6 +81,8 @@ import LengthPrefixedBE
 import Data.Binary.Put (putWord32be,runPut,putByteString)
 import Data.Binary.Get (runGet)
 
+import KeyRing
+
 -- instance Default S.ByteString where def = S.empty
 
 -- DER-encoded elliptic curve ids
@@ -739,13 +741,6 @@ unlockFiles lks = forM_ lks $ \(lk,f) -> do
     -- warn $ "unlocking "++show f
     dotlock_release lk
 
-parseOptionFile fname = do
-    xs <- fmap lines (readFile fname)
-    let ys = filter notComment xs
-        notComment ('#':_) = False
-        notComment cs      = not (all isSpace cs)
-    return ys
-
 {-
 options_from_file ::
         (forall a. [String] -> Term a -> IO (Either EvalExit a))
@@ -2564,45 +2559,6 @@ main = do
 
     return()
  where
-    envhomedir opt = do
-        gnupghome <- lookupEnv homevar >>=
-                  \d -> return $ d >>= guard . (/="") >> d
-        home <- flip fmap getHomeDirectory $
-                  \d -> fmap (const d) $ guard (d/="")
-        let homegnupg = (++('/':appdir)) <$> home
-        let val = (opt `mplus` gnupghome `mplus` homegnupg)
-        return $ val
-
-    homevar = "GNUPGHOME"
-    appdir  = ".gnupg"
-    optfile_alts = ["keys.conf","gpg.conf-2","gpg.conf"]
-
-    getHomeDir protohome = do
-        homedir <- envhomedir protohome
-        flip (maybe (error "Could not determine home directory."))
-             homedir $ \homedir -> do
-        -- putStrLn $ "homedir = " ++show homedir
-        let secring = homedir ++ "/" ++ "secring.gpg"
-            pubring = homedir ++ "/" ++ "pubring.gpg"
-        -- putStrLn $ "secring = " ++ show secring
-        workingkey <- getWorkingKey homedir
-        return (homedir,secring,pubring,workingkey)
-
-    -- TODO: rename this to getGrip
-    getWorkingKey homedir = do
-        let o = Nothing
-            h = Just homedir
-        ofile <- fmap listToMaybe . flip (maybe (return [])) h $ \h ->
-                let optfiles = map (second ((h++"/")++))
-                                   (maybe optfile_alts' (:[]) o')
-                    optfile_alts' = zip (False:repeat True) optfile_alts
-                    o' = fmap (False,) o
-                in filterM (doesFileExist . snd) optfiles
-        args <- flip (maybe $ return []) ofile $
-            \(forgive,fname) -> parseOptionFile fname
-        let config = map (topair . words) args
-                        where topair (x:xs) = (x,xs)
-        return $ lookup "default-key" config >>= listToMaybe
 
     {-
     getPGPEnviron cmd = do