1 files changed, 12 insertions, 10 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index cd69042..8c92a81 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -425,7 +425,7 @@ selectPublicKeyAndSigs (spec,mtag) db =
             : map (\(SubKey sub sigs)-> (packet sub, map (packet . fst) sigs))
                   (Map.elems $ keySubKeys kd)
       where
-        ismatch (p,sigs) = matchpr g p ==g
+        ismatch (p,sigs) = matchpr' g p
     findbyspec spec kd = if matchSpec spec kd then [topresult kd] else []
 
     findsubs tag (kk, KeyData topk _ _ subs) = Map.elems subs >>= gettag
@@ -673,7 +673,7 @@ isauth rt keydata = dont_have keydata && maybe False (`has_good_sig` keydata) wk
                 workingKey grip use_db = listToMaybe $ do
                             fp <- maybeToList grip
                             elm <- keyData use_db
-                            guard $ matchSpec (KeyGrip fp) elm
+                            guard $ matchSpec (KeyGrip $ show fp) elm
                             return $ keyPacket elm
 
 mkarmor :: Access -> L.ByteString -> [Armor]
@@ -734,7 +734,7 @@ writeRingKeys krd rt {- db wk secring pubring -} unspilled report_manips = do
                 case fill stream of
                     KF_Match usage -> do grip <- maybeToList $ rtGrip rt
                                          flattenTop f only_public
-                                            $ filterNewSubs f (parseSpec grip usage) d -- TODO: parseSpec3
+                                            $ filterNewSubs f (parseSpec (Just grip) usage) d -- TODO: parseSpec3
                     _              -> flattenTop f only_public d
             new_packets = filter isnew x
                 where isnew p = isNothing (Map.lookup (resolveForReport Nothing f0) $ locations p)
@@ -945,7 +945,7 @@ writePEMKeys doDecrypt db exports = do
 initializeMissingPEMFiles ::
     KeyRingOperation
       -> InputFileContext
-      -> Maybe String
+      -> Maybe Fingerprint
       -> Maybe MappedPacket
       -> PacketTranscoder
       -> KeyDB
@@ -974,7 +974,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do
                 usage <- maybeToList mutableTag
                 -- TODO: Use parseSpec3
                 -- TODO: Report error if generating without specifying usage tag.
-                let (topspec,subspec) = parseSpec (fromMaybe "" grip) usage
+                let (topspec,subspec) = parseSpec grip usage
                     -- ms will contain duplicates if a top key has multiple matching
                     -- subkeys.  This is intentional.
                     -- ms =  map (keykey . fst) $ selectAll True (topspec,subspec) db
@@ -1026,7 +1026,7 @@ initializeMissingPEMFiles operation ctx grip mwk transcode db = do
            let internals = mapMaybe getParams $ do
                     (f,stream) <- nonexistents
                     usage <- take 1 $ mapMaybe usageFromFilter [fill stream,spill stream]
-                    let (topspec,subspec) = parseSpec (fromMaybe "" grip) usage
+                    let (topspec,subspec) = parseSpec grip usage
                     guard $ null $ do
                         (kk,kd) <- filterMatches topspec $ kkData db
                         subkeysForExport subspec kd
@@ -1071,7 +1071,7 @@ runKeyRing operation =
 
 withLockedKeyring :: Maybe FilePath
                            -> Map.Map InputFile StreamInfo
-                           -> (InputFileContext -> Maybe String -> IO (KikiResult a))
+                           -> (InputFileContext -> Maybe Fingerprint -> IO (KikiResult a))
                            -> IO (KikiResult a)
 withLockedKeyring homespec opfiles go = do
     -- get homedir and keyring files + fingerprint for working key
@@ -1099,7 +1099,7 @@ withLockedKeyring homespec opfiles go = do
     return ret
 
 
-realRunKeyRing :: KeyRingOperation -> InputFileContext -> Maybe String -> IO (KikiResult KeyRingRuntime)
+realRunKeyRing :: KeyRingOperation -> InputFileContext -> Maybe Fingerprint -> IO (KikiResult KeyRingRuntime)
 realRunKeyRing operation ctx grip0 = do
         bresult <- buildKeyDB ctx grip0 operation
         try' bresult $ \((db, grip, wk, hs, accs,transcode,unspilled), report_imports) -> do
@@ -1163,7 +1163,7 @@ parseOptionFile fname = do
 --           , path to public ring
 --           , fingerprint of working key
 --           )
-getHomeDir :: Maybe FilePath -> IO (KikiCondition (FilePath,FilePath,FilePath,Maybe String))
+getHomeDir :: Maybe FilePath -> IO (KikiCondition (FilePath,FilePath,FilePath,Maybe Fingerprint))
 getHomeDir protohome = do
         homedir <- envhomedir protohome
         flip (maybe (return CantFindHome))
@@ -1183,6 +1183,7 @@ getHomeDir protohome = do
         return $ val
 
     -- TODO: rename this to getGrip
+    getWorkingKey :: String -> IO (Maybe Fingerprint)
     getWorkingKey homedir = do
         let o = Nothing
             h = Just homedir
@@ -1196,5 +1197,6 @@ getHomeDir protohome = do
             \(forgive,fname) -> parseOptionFile fname
         let config = map (topair . words) args
                         where topair (x:xs) = (x,xs)
-        return $ lookup "default-key" config >>= listToMaybe
+        -- return $ lookup "default-key" config >>= listToMaybe
+        return Nothing