summaryrefslogtreecommitdiff
path: root/KeyRing.hs
diff options
context:
space:
mode:
Diffstat (limited to 'KeyRing.hs')
-rw-r--r--KeyRing.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 52635be..58a2d01 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -158,7 +158,7 @@ data InputFile = HomeSec
158 | FileDesc Posix.Fd 158 | FileDesc Posix.Fd
159 deriving (Eq,Ord) 159 deriving (Eq,Ord)
160 160
161type UsageTag = String 161-- type UsageTag = String
162type Initializer = String 162type Initializer = String
163type PassWordFile = InputFile 163type PassWordFile = InputFile
164 164
@@ -167,7 +167,7 @@ type PassWordFile = InputFile
167-- the KF_Match fill/spill KeyFilter styles. The parameter 167-- the KF_Match fill/spill KeyFilter styles. The parameter
168-- to KeyRingFile will be subsumbed by kPassphrases 168-- to KeyRingFile will be subsumbed by kPassphrases
169data FileType = KeyRingFile (Maybe PassWordFile) 169data FileType = KeyRingFile (Maybe PassWordFile)
170 | PEMFile UsageTag 170 | PEMFile
171 | WalletFile -- (Maybe UsageTag) 171 | WalletFile -- (Maybe UsageTag)
172 | Hosts 172 | Hosts
173 173
@@ -242,7 +242,6 @@ noManip _ _ = []
242 242
243data KeyRingOperation = KeyRingOperation 243data KeyRingOperation = KeyRingOperation
244 { kFiles :: Map.Map InputFile StreamInfo 244 { kFiles :: Map.Map InputFile StreamInfo
245 , kImports :: Map.Map InputFile (KeyRingRuntime -> KeyData -> Maybe Bool)
246 , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate] 245 , kManip :: KeyRingRuntime -> KeyData -> [PacketUpdate]--[KeyRingAddress PacketUpdate]
247 , homeSpec :: Maybe String 246 , homeSpec :: Maybe String
248 } 247 }