summaryrefslogtreecommitdiff
path: root/KeyRing.hs
diff options
context:
space:
mode:
Diffstat (limited to 'KeyRing.hs')
-rw-r--r--KeyRing.hs4
1 files changed, 4 insertions, 0 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 58a2d01..d057cd4 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -243,6 +243,7 @@ noManip _ _ = []
243data KeyRingOperation = KeyRingOperation 243data KeyRingOperation = KeyRingOperation
244 { kFiles :: Map.Map InputFile StreamInfo 244 { kFiles :: Map.Map InputFile StreamInfo
245 , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate] 245 , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate]
246 -- TODO: change kManip to [Transform]
246 , homeSpec :: Maybe String 247 , homeSpec :: Maybe String
247 } 248 }
248 249
@@ -1335,6 +1336,7 @@ importSecret = Just False
1335subkeysOnly :: Maybe Bool 1336subkeysOnly :: Maybe Bool
1336subkeysOnly = Nothing 1337subkeysOnly = Nothing
1337 1338
1339-- TODO: Do we need to memoize this?
1338guardAuthentic :: KeyRingRuntime -> KeyData -> Maybe () 1340guardAuthentic :: KeyRingRuntime -> KeyData -> Maybe ()
1339guardAuthentic rt keydata = guard (isauth rt keydata) 1341guardAuthentic rt keydata = guard (isauth rt keydata)
1340 1342
@@ -1728,6 +1730,8 @@ runKeyRing operation = do
1728 else do 1730 else do
1729 1731
1730 -- memoizing decrypter 1732 -- memoizing decrypter
1733 -- TODO: Unspilled keyrings should be usable for decrypting
1734 -- and signing.
1731 decrypt <- makeMemoizingDecrypter operation secring pubring 1735 decrypt <- makeMemoizingDecrypter operation secring pubring
1732 1736
1733 -- merge all keyrings, PEM files, and wallets 1737 -- merge all keyrings, PEM files, and wallets