put the proper time stamps on ipsec/ssh exports.

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index a0d1e1a..21d7c3e 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -100,6 +100,8 @@ module KeyRing
     , secretPemFromPacket
     , SubkeyStatus(..)
     , getSubkeys
+    , writeKeyToFile
+    , resolveForReport
     ) where
 
 import System.Environment
@@ -662,7 +664,7 @@ data KikiReportAction =
         | FailedFileWrite
         | HostsDiff ByteString
         | DeletedPacket String
- deriving Show
+ deriving (Eq,Show)
 
 uncamel :: String -> String
 uncamel str = unwords $ firstWord ++ (toLower .: otherWords) ++ args
@@ -2246,8 +2248,8 @@ pemFromPacket AutoAccess p@(SecretKeyPacket {}) = pemFromPacket Sec p
 pemFromPacket AutoAccess _ = Nothing
 
 writeKeyToFile ::
-  Bool -> StreamInfo -> InputFile -> Packet -> IO [(InputFile, KikiReportAction)]
-writeKeyToFile False stream@(StreamInfo { typ = PEMFile }) fname packet = do
+  StreamInfo -> InputFile -> Packet -> IO [(InputFile, KikiReportAction)]
+writeKeyToFile stream@(StreamInfo { typ = PEMFile }) fname packet = do
     case pemFromPacket (access stream) packet of
      Just output -> do
         let stamp = toEnum . fromEnum $ timestamp packet
@@ -2260,7 +2262,7 @@ writeKeyToFile False stream@(StreamInfo { typ = PEMFile }) fname packet = do
             return [(fname, ExportedSubkey)]
      Nothing -> return [(fname, UnableToExport (key_algorithm packet) $ fingerprint packet)]
 
-writeKeyToFile False StreamInfo { typ = DNSPresentation } fname packet = do
+writeKeyToFile StreamInfo { typ = DNSPresentation } fname packet = do
     case key_algorithm packet of
      RSA -> do
         flip (maybe (return []))
@@ -2308,7 +2310,7 @@ writePEMKeys doDecrypt db exports = do
     let ds' = map functorToEither ds
     if null (lefts ds')
         then do
-            rs <- mapM (\(f,stream,p) -> writeKeyToFile False stream (ArgFile f) p)
+            rs <- mapM (\(f,stream,p) -> writeKeyToFile stream (ArgFile f) p)
                        (rights ds')
             return $ KikiSuccess (map (first $ resolveForReport Nothing) $ concat rs)
         else do