summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-05-09 20:34:46 -0400
committerjoe <joe@jerkface.net>2014-05-09 20:34:46 -0400
commite1fbcbd60344f8cc5d60ff611114e30209e3c8f2 (patch)
tree65ebd34ba1d87f1f6d95763d3e22997c7ee10a5e
parent5154f8b90f6a40a94d624b66820b7437d8fd8fb3 (diff)
FilePath is more descriptive than [Char]
-rw-r--r--KeyRing.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 377e6e2..b0dff04 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1107,7 +1107,7 @@ importPEMKey ::
1107 (MappedPacket -> IO (KikiCondition Packet)) 1107 (MappedPacket -> IO (KikiCondition Packet))
1108 -> KikiCondition 1108 -> KikiCondition
1109 (Map.Map KeyKey KeyData, [(FilePath, KikiReportAction)]) 1109 (Map.Map KeyKey KeyData, [(FilePath, KikiReportAction)])
1110 -> ([Char], Maybe [Char], [KeyKey], t) 1110 -> (FilePath, Maybe [Char], [KeyKey], t)
1111 -> IO (KikiCondition (Map.Map KeyKey KeyData, [(FilePath, KikiReportAction)])) 1111 -> IO (KikiCondition (Map.Map KeyKey KeyData, [(FilePath, KikiReportAction)]))
1112importPEMKey doDecrypt db' tup = do 1112importPEMKey doDecrypt db' tup = do
1113 try db' $ \(db',report0) -> do 1113 try db' $ \(db',report0) -> do
@@ -1455,7 +1455,7 @@ doImport
1455 :: Ord k => 1455 :: Ord k =>
1456 (MappedPacket -> IO (KikiCondition Packet)) 1456 (MappedPacket -> IO (KikiCondition Packet))
1457 -> Map.Map k KeyData 1457 -> Map.Map k KeyData
1458 -> ([Char], Maybe [Char], [k], t) 1458 -> (FilePath, Maybe [Char], [k], t)
1459 -> IO (KikiCondition (Map.Map k KeyData, [(FilePath,KikiReportAction)])) 1459 -> IO (KikiCondition (Map.Map k KeyData, [(FilePath,KikiReportAction)]))
1460doImport doDecrypt db (fname,subspec,ms,_) = do 1460doImport doDecrypt db (fname,subspec,ms,_) = do
1461 let fetchkey = readKeyFromFile False "PEM" (ArgFile fname) 1461 let fetchkey = readKeyFromFile False "PEM" (ArgFile fname)