From 2d001913d97ccc05af3b062b42b0df8b155d2a73 Mon Sep 17 00:00:00 2001 From: Joe Crayne Date: Sat, 6 Jul 2019 15:19:04 -0400 Subject: Minor cleanup, comments. --- lib/PacketTranscoder.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/PacketTranscoder.hs') 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 -- The transcoder works on 'MappedPacket' instead of 'Packet' so that -- file-specific passphrases can be utilized. -makeMemoizingDecrypter :: KeyRingOperation -> InputFileContext +makeMemoizingDecrypter :: [PassphraseSpec] -> InputFileContext -> (Maybe MappedPacket, Map.Map KeyKey (OriginMapped Query)) -> IO PacketTranscoder -makeMemoizingDecrypter operation ctx (workingkey,keys) = do +makeMemoizingDecrypter passwdspec ctx (workingkey,keys) = do unkeysRef <- newIORef (Map.empty :: Map.Map (KeyKey,SymmetricAlgorithm,S2K) Packet) return $ tryInOrder $ map passSpecTranscoder chains ++ [ trans unkeysRef ] where - (chains,passpecs) = span isChain $ sort $ opPassphrases operation + (chains,passpecs) = span isChain $ sort passwdspec where isChain (PassphraseMemoizer {}) = True isChain _ = False srcs = map (interpretPassSpec ctx (workingkey,keys)) passpecs -- cgit v1.2.3