1 files changed, 12 insertions, 12 deletions

diff --git a/lib/Transforms.hs b/lib/Transforms.hs
index 9571e7e..e7097ba 100644
--- a/lib/Transforms.hs
+++ b/lib/Transforms.hs
@@ -177,7 +177,7 @@ findTag tag topk subkey subsigs = (xs',minsig,ys')
                                 sig <- Just (packet . fst $ sig)
                                 guard (isSignaturePacket sig)
                                 guard $ flip isSuffixOf
-                                             (fingerprint topk)
+                                             (show $ fingerprint topk)
                                         . fromMaybe "%bad%" 
                                         . signature_issuer
                                         $ sig
@@ -217,7 +217,7 @@ mkUsage tag = NotationDataPacket
 
 
 smallpr :: Packet -> [Char]
-smallpr k = drop 24 $ fingerprint k
+smallpr k = drop 24 $ show $ fingerprint k
 
 backsig :: SignatureSubpacket -> Maybe Packet
 backsig (EmbeddedSignaturePacket s) = Just s
@@ -298,7 +298,7 @@ getBindings pkts = (sigs,bindings)
             b <- bs -- trace ("sigs = "++show (map (map signature_issuer . signatures_over) sigs)) bs
             i <- map signature_issuer (signatures_over b)
             i <- maybeToList i
-            who <- maybeToList $ find_key fingerprint (Message keys) i
+            who <- maybeToList $ find_key (show . fingerprint) (Message keys) i
             let (code,claimants) =
                     case () of
                         _ | who == topkey b -> (1,[])
@@ -322,7 +322,7 @@ accBindings bs = as
     bindingPair (_,p,_,_,_) = pub2 p
       where
         pub2 (a,b) = (pub a, pub b)
-        pub a = fingerprint_material a
+        pub a = show $ fingerprint_material a
     samePair a b = bindingPair a == bindingPair b
     combine (ac,p,akind,ahashed,aclaimaints)
             (bc,_,bkind,bhashed,bclaimaints)
@@ -363,7 +363,7 @@ showPacket :: Packet -> String
 showPacket p | isKey p   = (if is_subkey p
                               then showPacket0 p
                               else ifSecret p "---Secret" "---Public")
-                           ++ " "++fingerprint p
+                           ++ " "++show (fingerprint p)
                            ++ " "++show (key_algorithm p)
                            ++ case key_nbits p of { 0 -> ""; n -> "("++show n++")" }
              | Just uid <- isUserID p  = showPacket0 p ++ " " ++ show uid
@@ -405,7 +405,7 @@ makeInducerSig topk wkun uid extras
     subpackets = -- implicit: [ SignatureCreationTimePacket (fromIntegral timestamp) ]
                  tsign
                  ++ extras
-    subpackets_unh = [IssuerPacket (fingerprint wkun)]
+    subpackets_unh = [IssuerPacket (show $ fingerprint wkun)]
     tsign = if keykey wkun == keykey topk
              then [] -- tsign doesnt make sense for self-signatures
              else [ TrustSignaturePacket 1 120
@@ -540,7 +540,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
     let wk = packet top
     wkun <- doDecrypt top
     try wkun $ \wkun -> do
-    let grip = fingerprint wk
+    let grip = show $ fingerprint wk
         addOrigin new_sig =
             flip (maybe $ return FailedToMakeSignature)
                  (new_sig >>= listToMaybe . signatures_over)
@@ -563,7 +563,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                     -- , SignatureCreationTimePacket (fromIntegral timestamp)
         isFlagsPacket (KeyFlagsPacket {}) = True
         isFlagsPacket _                   = False
-        subgrip = fingerprint (head parsedkey)
+        subgrip = show $ fingerprint (head parsedkey)
 
     back_sig <- pgpSign (Message parsedkey)
                         (SubkeySignature wk
@@ -575,7 +575,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                             then SHA256
                             else SHA1)
                         subgrip
-    let iss = IssuerPacket (fingerprint wk)
+    let iss = IssuerPacket (show $ fingerprint wk)
         cons_iss back_sig = iss : map EmbeddedSignaturePacket (signatures_over back_sig)
         unhashed0 = maybe [iss] cons_iss back_sig
 
@@ -619,7 +619,7 @@ makeSig doDecrypt top fname subkey_p tags mbsig = do
                                             (packet subkey_p)
                                             [sig'] )
                            SHA1
-                           (fingerprint wk)
+                           (show $ fingerprint wk)
         newsig <- addOrigin new_sig
         return $ fmap (,[]) newsig
 
@@ -676,7 +676,7 @@ performManipulations doDecrypt rt wk manip = do
                 new_sig <- maybeToList new_sig
                 guard (null $ selfsigs)
                 signatures_over new_sig
-        sigr <- pgpSign (Message [wkun]) sigOver SHA1 (fingerprint wkun)
+        sigr <- pgpSign (Message [wkun]) sigOver SHA1 (show $ fingerprint wkun)
         let f ::([SigAndTrust],OriginMap) -> ([SigAndTrust],OriginMap)
             f x = ( map ( (,Map.empty) . toMappedPacket om) (additional sigr) ++ fst x
                   , om `Map.union` snd x )
@@ -795,7 +795,7 @@ resolveTransform (DeleteSubkeyByFingerprint fp) rt kd@(KeyData k ksigs umap subm
     topk = keykey $ packet k -- key to master of key to be deleted
     subk = do
         (k,sub) <- Map.toList submap
-        guard (map toUpper fp == fingerprint (packet (subkeyMappedPacket sub)))
+        guard $ map toUpper fp == show (fingerprint $ packet $ subkeyMappedPacket sub)
         return k
 
 -- (3 of 4) resolveTransform :: Transform -> KeyRingRuntime -> KeyData -> [PacketUpdate]