1 files changed, 17 insertions, 8 deletions

diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index 1177789..1a12a61 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE DeriveFunctor     #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE PatternSynonyms   #-}
@@ -119,7 +120,7 @@ data PassphraseSpec = PassphraseSpec
     { passSpecRingFile :: Maybe FilePath
     -- ^ If not Nothing, the passphrase is to be used for packets
     -- from this file.
-    , passSpecKeySpec :: Maybe String
+    , passSpecKeySpec :: Maybe Fingerprint
     -- ^ Non-Nothing value reserved for future use.
     -- (TODO: Use this to implement per-key passphrase associations).
     , passSpecPassFile :: InputFile
@@ -129,6 +130,9 @@ data PassphraseSpec = PassphraseSpec
     | PassphraseMemoizer { passSpecTranscoder :: PacketTranscoder }
     | PassphraseAgent
 
+deriving instance Ord Fingerprint
+deriving instance Eq Fingerprint
+
 instance Show PassphraseSpec where
     show (PassphraseSpec a b c) = "PassphraseSpec "++show (a,b,c)
     show (PassphraseMemoizer _) = "PassphraseMemoizer"
@@ -350,14 +354,19 @@ isTrust _                = False
 -- matchpr fp = Data.List.Extra.takeEnd (length fp)
 --
 matchpr :: Fingerprint -> Packet -> Bool
-matchpr fp k = p == show fp
-  where
-    p = reverse $ zipWith const (reverse (show $ fingerprint k)) (show fp)
+matchpr fp k = matchpr' (show fp) k
 
+matchpr' :: String -> Packet -> Bool
+matchpr' fp k = p == fp
+  where
+    p = reverse $ zipWith const (reverse (show $ fingerprint k)) fp
 
+matchpr'' :: String -> Packet -> String
+matchpr'' fp k | matchpr' fp k = fp
+matchpr'' fp k | otherwise = ""
 
 data KeySpec =
-      KeyGrip Fingerprint  -- fp:
+      KeyGrip String       -- fp:
     | KeyTag Packet String -- fp:????/t:
     | KeyUidMatch String   -- u:
  deriving Show
@@ -428,8 +437,8 @@ 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
-    pred p@(PublicKeyPacket {}) = matchpr grip p
+    pred p@(SecretKeyPacket {}) = matchpr' grip p
+    pred p@(PublicKeyPacket {}) = matchpr' grip p
     pred _                      = False
 
 seek_key (KeyTag key tag) ps
@@ -442,7 +451,7 @@ seek_key (KeyTag key tag) ps
     (as,bs) = break (\p -> isSignaturePacket p
                         && has_tag tag p
                         && isJust (signature_issuer p)
-                        && matchpr (fromJust $ signature_issuer p) key == fromJust (signature_issuer p) )
+                        && matchpr' (fromJust $ signature_issuer p) key)
                     ps
     (rs,qs) = break isKey (reverse as)