Switched fingerprint to wrapped ByteString + some module shuffling.

1 files changed, 7 insertions, 7 deletions

diff --git a/kiki.hs b/kiki.hs
index 7d825d3..0b884ae 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -72,7 +72,7 @@ isCertificationSig _                           = True
 fpmatch :: Maybe [Char] -> Packet -> Bool
 fpmatch grip key =
     (==) Nothing
-         (fmap (backend (fingerprint key)) grip >>= guard . not)
+         (fmap (backend (show $ fingerprint key)) grip >>= guard . not)
  where
     backend xs ys = and $ zipWith (==) (reverse xs) (reverse ys)
 
@@ -105,11 +105,11 @@ listKeysFiltered grips pkts = do
         matchgrip ((code,(top,sub), kind, hashed,claimants):_) | any (flip fpmatch top . Just) grips = True
         matchgrip _ = False
         gs = filter matchgrip $ groupBy sameMaster (sortBy (comparing code) as)
-        singles = filter (\k -> fingerprint k `notElem` map fingerprint parents) masterkeys -- \\ parents
+        singles = filter (\k -> show (fingerprint k) `notElem` map (show . fingerprint) parents) masterkeys -- \\ parents
           where parents = do
                     subs@((_,(top,_),_,_,_):_) <- gs
                     return top
-        showsigs claimants = map (\k -> "      " ++ "^ signed: " ++ fingerprint k) claimants
+        showsigs claimants = map (\k -> "      " ++ "^ signed: " ++ show (fingerprint k)) claimants
     subs0 <- map Left gs ++ map Right singles
     let (top,subs) = case subs0 of Left subs1@((_,(top0,_),_,_,_):_) -> (top0,subs1)
                                    Right top0                        -> (top0,[])
@@ -133,7 +133,7 @@ listKeysFiltered grips pkts = do
                         , ar
                         , formkind
                         , " "
-                        , fingerprint sub
+                        , show $ fingerprint sub
                         , kcipher sub
                         -- , " " ++ (torhash sub)
                         -- , " " ++ (concatMap (printf "%02X") $ S.unpack (ecc_curve sub))
@@ -179,7 +179,7 @@ listKeysFiltered grips pkts = do
                         listToMaybe $ filter match torkeys
             unlines $  (" " ++ ar ++ "@" ++ " " ++ uid_full parsed) : showsigs secondary
         -- (_,sigs) = unzip certs
-    "master-key " ++ fingerprint top ++ kcipher top ++ "\n" ++ uid ++"  ...\n" ++ subkeys ++ "\n"
+    "master-key " ++ show (fingerprint top) ++ kcipher top ++ "\n" ++ uid ++"  ...\n" ++ subkeys ++ "\n"
 
 
 {-
@@ -258,7 +258,7 @@ show_whose_key input_key db =
     let ks = whoseKey input_key db
     case ks of
         [KeyData k _ uids _] -> do
-            putStrLn $ fingerprint (packet k)
+            putStrLn $ show $ fingerprint (packet k)
             mapM_ putStrLn $ unUidString <$> Map.keys uids
         (_:_) -> error "ambiguous"
         [] -> return ()
@@ -1762,7 +1762,7 @@ tarC (sargs,margs) = do
         case r of
             KikiSuccess p -> return $ Just p
             _ -> do
-                hPutStrLn stderr $ "Failed to decrypt "++fingerprint k++"."
+                hPutStrLn stderr $ "Failed to decrypt "++show (fingerprint k) ++ "."
                 return Nothing
 -- |
 --