1 files changed, 8 insertions, 7 deletions

diff --git a/lib/PacketTranscoder.hs b/lib/PacketTranscoder.hs
index 759d83f..71a2202 100644
--- a/lib/PacketTranscoder.hs
+++ b/lib/PacketTranscoder.hs
@@ -3,8 +3,6 @@
 {-# LANGUAGE PatternGuards #-}
 module PacketTranscoder where
 
-import Debug.Trace
-import GHC.Stack
 import Control.Monad
 import Data.IORef
 import Data.List
@@ -16,12 +14,10 @@ import qualified Data.ByteString       as S
 import qualified Data.ByteString.Char8 as S8
 import           Data.Map as Map (Map)
 import qualified Data.Map as Map
-import qualified Data.Traversable      as Traversable
 import System.IO              ( stderr)
 import System.Posix.IO        ( fdToHandle )
 import Text.Show.Pretty as PP ( ppShow )
 import KeyRing.Types
-import ControlMaybe (handleIO_)
 
 -- | Merge two representations of the same key, prefering secret version
 -- because they have more information.
@@ -113,7 +109,7 @@ interpretPassSpec ctx _ PassphraseSpec { passSpecPassFile = fd
         cachedContents (Just "Enter possibly multi-line passphrase (Press CTRL-D when finished):\n")
                        ctx
                        fd
-    let matchkey fp mp = matchpr fp (packet mp) == fp
+    let matchkey fp mp = matchKeySpec fp (packet mp)
         matchfile file mp = Map.member file (locations mp)
         specializers = [ fmap matchkey keyspec, fmap matchfile inputfile]
         specialize alg mp =
@@ -142,6 +138,11 @@ interpretPassSpec ctx keys PassphraseAgent = do
 
     return $ KikiSuccess (cacheSearch, quit agent)
 
+interpretPassSpec ctx keys (PassphraseMemoizer _) =
+    -- INVALID ARGUMENT: PassphraseMemoizer
+    return BadPassphrase
+
+
 sendQuery :: GnuPGAgent -> (QueryMode,PassphraseResponse) -> OriginMapped Query -> IO PassphraseResponse
 sendQuery agent (ask,failure) qry = do
     mbpw <- getPassphrase agent ask (packet qry)
@@ -291,8 +292,8 @@ keyQueries grip ringPackets = (mwk, fmap makeQuery keys)
     mwk = listToMaybe $ do
             fp <- maybeToList grip
             let matchfp mp
-                 | not (is_subkey p) && matchpr fp p == fp = Just mp
-                 | otherwise                               = Nothing
+                 | not (is_subkey p) && matchpr 0 fp p == fp = Just mp
+                 | otherwise                                 = Nothing
                     where p = packet mp
             Map.elems $ Map.mapMaybe matchfp $ fmap (\(_,p,_) -> p) $ keys