From 7a94f5103671011295f818bfcf30280423c44042 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 16 Jul 2019 17:51:31 -0400
Subject: use more Fingerprint WIP

---
 lib/KeyRing/Types.hs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib/KeyRing/Types.hs')

diff --git a/lib/KeyRing/Types.hs b/lib/KeyRing/Types.hs
index 5318b31..1177789 100644
--- a/lib/KeyRing/Types.hs
+++ b/lib/KeyRing/Types.hs
@@ -349,14 +349,15 @@ isTrust _                = False
 --
 -- matchpr fp = Data.List.Extra.takeEnd (length fp)
 --
-matchpr :: String -> Packet -> String
-matchpr fp k = reverse $ zipWith const (reverse (show $ fingerprint k)) fp
-
+matchpr :: Fingerprint -> Packet -> Bool
+matchpr fp k = p == show fp
+  where
+    p = reverse $ zipWith const (reverse (show $ fingerprint k)) (show fp)
 
 
 
 data KeySpec =
-      KeyGrip String       -- fp:
+      KeyGrip Fingerprint  -- fp:
     | KeyTag Packet String -- fp:????/t:
     | KeyUidMatch String   -- u:
  deriving Show
@@ -427,8 +428,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 == grip
-    pred p@(PublicKeyPacket {}) = matchpr grip p == grip
+    pred p@(SecretKeyPacket {}) = matchpr grip p
+    pred p@(PublicKeyPacket {}) = matchpr grip p
     pred _                      = False
 
 seek_key (KeyTag key tag) ps
-- 
cgit v1.2.3