1 files changed, 0 insertions, 67 deletions

diff --git a/kiki.hs b/kiki.hs
index 1c6fa37..43d170c 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -650,19 +650,6 @@ getPassphrase cmd =
 
 #define HOMEOPTION (def &= explicit &= name "homedir" &= typDir )
 
-flattenKeys :: Bool -> KeyDB -> Message
-flattenKeys isPublic db = Message $ concatMap (map packet . flattenTop "" isPublic . snd) (prefilter . Map.assocs $ db)
- where
-    prefilter = if isPublic then id else filter isSecret
-                 where
-                  isSecret (_,(KeyData
-                                  (MappedPacket { packet=(SecretKeyPacket {})})
-                                  _
-                                  _
-                                  _)) = True
-                  isSecret _          = False
-
-
 writeOutKeyrings :: Map.Map FilePath t -> KeyDB -> IO ()
 writeOutKeyrings lkmap db = do
     let ks = Map.elems db
@@ -1704,60 +1691,6 @@ isTopKey p@(SecretKeyPacket {}) | not (is_subkey p) = True
 isTopKey p@(PublicKeyPacket {}) | not (is_subkey p) = True
 isTopKey _ = False
 
-selectSecretKey :: (KeySpec,Maybe String) -> KeyDB -> Maybe Packet
-selectSecretKey (spec,mtag) db = selectKey0 False (spec,mtag) db
-
-selectPublicKey :: (KeySpec,Maybe String) -> KeyDB -> Maybe Packet
-selectPublicKey (spec,mtag) db = selectKey0 True (spec,mtag) db
-
-selectKey0 :: Bool -> (KeySpec,Maybe String) -> KeyDB -> Maybe Packet
-selectKey0 wantPublic (spec,mtag) db = do
-    let Message ps = flattenKeys wantPublic db
-        ys = snd $ seek_key spec ps
-    flip (maybe (listToMaybe ys)) mtag $ \tag -> do
-    let (subspec,ys1) = (KeyTag y tag,ys1) where y:ys1 = ys
-        zs = snd $ seek_key subspec ys1
-    listToMaybe zs
-
-seek_key :: KeySpec -> [Packet] -> ([Packet],[Packet])
-seek_key (KeyGrip grip) sec = (pre, subs)
-  where
-    (pre,subs) = break pred sec
-    pred p@(SecretKeyPacket {}) = matchpr grip p == grip
-    pred p@(PublicKeyPacket {}) = matchpr grip p == grip
-    pred _                      = False
-
-seek_key (KeyTag key tag) ps = if null bs
-                                then (ps,[])
-                                else if null qs
-                                 then let (as',bs') = seek_key (KeyTag key tag) (tail bs)
-                                      in (as ++ (head bs:as'), bs')
-                                 else (reverse (tail qs), head qs : reverse rs ++ bs)
-  where
-    (as,bs) = break (\p -> isSignaturePacket p
-                        && has_tag tag p
-                        && isJust (signature_issuer p)
-                        && matchpr (fromJust $ signature_issuer p) key == fromJust (signature_issuer p) )
-                    ps
-    (rs,qs) = break isKey (reverse as)
-
-    has_tag tag p = tag `elem` mapMaybe usage (hashed_subpackets p)
-                    || tag `elem` map usageString (mapMaybe keyflags (hashed_subpackets p))
-
-seek_key (KeyUidMatch pat) ps = if null bs
-                                then (ps,[])
-                                else if null qs
-                                 then let (as',bs') = seek_key (KeyUidMatch pat) (tail bs)
-                                      in (as ++ (head bs:as'), bs')
-                                 else (reverse (tail qs), head qs : reverse rs ++ bs)
-  where
-    (as,bs) = break (isInfixOf pat . uidStr)
-                    ps
-    (rs,qs) = break isKey (reverse as)
-
-    uidStr (UserIDPacket s) = s
-    uidStr _                = ""
-
 groupTops ps = groupBy (\_ b -> not (isTopKey b)) ps