cokiki build fix & show --packets option.

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/PacketTranscoder.hs b/lib/PacketTranscoder.hs
index 07f235c..6d1d9b8 100644
--- a/lib/PacketTranscoder.hs
+++ b/lib/PacketTranscoder.hs
@@ -19,6 +19,7 @@ import System.IO              ( stderr)
 import System.Posix.IO        ( fdToHandle )
 import Text.Show.Pretty as PP ( ppShow )
 import Types
+import ControlMaybe (handleIO_)
 
 -- | Merge two representations of the same key, prefering secret version
 -- because they have more information.
@@ -168,6 +169,7 @@ makeMemoizingDecrypter operation ctx (workingkey,keys) = do
                 --  in the 'locations' field, so this would effectively
                 --  allow you to run 'decryptIt' on an unencrypted public key
                 --  to obtain it's secret key.
+                handleIO_ (decryptIt []) $ do
                 (pw,wants_retry) <- getpw (count,qry)
                 let wkun = fromMaybe wk $ do
                                 guard $ symmetric_algorithm (packet mp) /= Unencrypted
@@ -218,11 +220,12 @@ makeMemoizingDecrypter operation ctx (workingkey,keys) = do
                               | otherwise         = return ()
                     clear
                     let sanitizeQry qry = (fingerprint $ queryPacket qry, queryUID qry, fmap fingerprint $ queryMainKey qry)
-                    putStrLn $ "(count,firsttime,ask,qry,actual_qry)="++show (count,firsttime,ask,sanitizeQry qry, sanitizeQry actual_qry)
+                    -- putStrLn $ "(count,firsttime,ask,qry,actual_qry)="++show (count,firsttime,ask,sanitizeQry qry, sanitizeQry actual_qry)
                     mbpw <- getPassphrase s ask actual_qry
                     quit s
                     return ( maybe "" S8.pack mbpw, guard (ask /= AskNew) >> Just clear )
 
+        -- putStrLn $ concat [show (symmetric_algorithm wk,s2k wk)," --> ",show (dest_alg,dest_s2k)]
         if symmetric_algorithm wk == dest_alg
             && ( symmetric_algorithm wk == Unencrypted || s2k wk == dest_s2k )
             then return (KikiSuccess wk)