summaryrefslogtreecommitdiff
path: root/lib/PacketTranscoder.hs
diff options
context:
space:
mode:
authorJoe Crayne <joe@jerkface.net>2019-07-06 15:19:04 -0400
committerJoe Crayne <joe@jerkface.net>2019-07-06 15:19:04 -0400
commit2d001913d97ccc05af3b062b42b0df8b155d2a73 (patch)
tree6b3c4e5b3fda73df0c4ada4228ea7dcd0709f814 /lib/PacketTranscoder.hs
parentb0967e64df7a4f4d1cd2af95ccda8a0ba3447138 (diff)
Minor cleanup, comments.
Diffstat (limited to 'lib/PacketTranscoder.hs')
-rw-r--r--lib/PacketTranscoder.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/PacketTranscoder.hs b/lib/PacketTranscoder.hs
index 03b219b..830ec2f 100644
--- a/lib/PacketTranscoder.hs
+++ b/lib/PacketTranscoder.hs
@@ -253,14 +253,14 @@ tryInOrder (f:fs) alg mp = do
253 253
254-- The transcoder works on 'MappedPacket' instead of 'Packet' so that 254-- The transcoder works on 'MappedPacket' instead of 'Packet' so that
255-- file-specific passphrases can be utilized. 255-- file-specific passphrases can be utilized.
256makeMemoizingDecrypter :: KeyRingOperation -> InputFileContext 256makeMemoizingDecrypter :: [PassphraseSpec] -> InputFileContext
257 -> (Maybe MappedPacket, Map.Map KeyKey (OriginMapped Query)) 257 -> (Maybe MappedPacket, Map.Map KeyKey (OriginMapped Query))
258 -> IO PacketTranscoder 258 -> IO PacketTranscoder
259makeMemoizingDecrypter operation ctx (workingkey,keys) = do 259makeMemoizingDecrypter passwdspec ctx (workingkey,keys) = do
260 unkeysRef <- newIORef (Map.empty :: Map.Map (KeyKey,SymmetricAlgorithm,S2K) Packet) 260 unkeysRef <- newIORef (Map.empty :: Map.Map (KeyKey,SymmetricAlgorithm,S2K) Packet)
261 return $ tryInOrder $ map passSpecTranscoder chains ++ [ trans unkeysRef ] 261 return $ tryInOrder $ map passSpecTranscoder chains ++ [ trans unkeysRef ]
262 where 262 where
263 (chains,passpecs) = span isChain $ sort $ opPassphrases operation 263 (chains,passpecs) = span isChain $ sort passwdspec
264 where isChain (PassphraseMemoizer {}) = True 264 where isChain (PassphraseMemoizer {}) = True
265 isChain _ = False 265 isChain _ = False
266 srcs = map (interpretPassSpec ctx (workingkey,keys)) passpecs 266 srcs = map (interpretPassSpec ctx (workingkey,keys)) passpecs