diff options
Diffstat (limited to 'KeyRing.hs')
-rw-r--r-- | KeyRing.hs | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 | ||
161 | type UsageTag = String | 161 | -- type UsageTag = String |
162 | type Initializer = String | 162 | type Initializer = String |
163 | type PassWordFile = InputFile | 163 | type 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 |
169 | data FileType = KeyRingFile (Maybe PassWordFile) | 169 | data 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 | ||
243 | data KeyRingOperation = KeyRingOperation | 243 | data 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 | } |