1 files changed, 4 insertions, 4 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index af7f3f4..1c68d36 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -791,7 +791,7 @@ extractPEM typ pem = dta
 
 doImport
   :: Ord k =>
-     (Packet -> IO (KikiCondition Packet))
+     (MappedPacket -> IO (KikiCondition Packet))
      -> Map.Map k KeyData
      -> ([Char], Maybe [Char], [k], t)
      -> IO (KikiCondition (Map.Map k KeyData, [(FilePath,KikiReportAction)]))
@@ -809,7 +809,7 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
 
 doImportG
   :: Ord k =>
-     (Packet -> IO (KikiCondition Packet))
+     (MappedPacket -> IO (KikiCondition Packet))
      -> Map.Map k KeyData
      -> [k]
      -> [Char]
@@ -845,7 +845,7 @@ doImportG doDecrypt db m0 tag fname key = do
                          s <- (signatures $ Message (packet top:UserIDPacket idstr:map (packet . fst) sigtrusts))
                          signatures_over $ verify (Message [packet top]) s
                 flip (flip maybe $ const $ return $ KikiSuccess (uids,[])) has_torid $ do
-                wkun <- doDecrypt (packet top)
+                wkun <- doDecrypt top
 
                 try wkun $ \wkun -> do
 
@@ -1492,7 +1492,7 @@ findTag tag wk subkey subsigs = (xs',minsig,ys')
 
 makeSig doDecrypt top fname subkey_p tag mbsig = do
     let wk = packet top
-    wkun <- doDecrypt wk
+    wkun <- doDecrypt top
     try wkun $ \wkun -> do
     let grip = fingerprint wk
         addOrigin new_sig = do