diff options
-rw-r--r-- | lib/Kiki.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Kiki.hs b/lib/Kiki.hs index eabd8ed..ca6e80f 100644 --- a/lib/Kiki.hs +++ b/lib/Kiki.hs | |||
@@ -262,11 +262,7 @@ importAndRefresh root cmn cipher = do | |||
262 | HomeSec | 262 | HomeSec |
263 | $ encode $ Message [packet master_un] | 263 | $ encode $ Message [packet master_un] |
264 | putStrLn "Wrote master key" | 264 | putStrLn "Wrote master key" |
265 | -- FIXME: Why are we re-generating the tor key here? Does this | 265 | return (FileDesc read_tor, []) |
266 | -- code get triggered when the user cancels the agent prompt? | ||
267 | -- If so, he's likely canceling encryption, not the .onion name | ||
268 | -- he was already shown. | ||
269 | return (Generate 0 (GenRSA $ 1024 `div` 8 ), []) | ||
270 | 266 | ||
271 | -- If the public ring does not exist, then creating an empty file is | 267 | -- If the public ring does not exist, then creating an empty file is |
272 | -- sufficient to satisfy 'runKeyRing'. However, as we've already generated | 268 | -- sufficient to satisfy 'runKeyRing'. However, as we've already generated |
@@ -311,7 +307,11 @@ importAndRefresh root cmn cipher = do | |||
311 | } | 307 | } |
312 | nop = | 308 | nop = |
313 | KeyRingOperation | 309 | KeyRingOperation |
314 | { opFiles = Map.empty | 310 | { opFiles = Map.fromList -- It's too late for a true no-op, |
311 | -- so we'll sync the keyrings at least. | ||
312 | [ ( HomeSec, buildStreamInfo KF_All KeyRingFile ) | ||
313 | , ( HomePub, (buildStreamInfo KF_All KeyRingFile) { access = Pub } ) | ||
314 | ] | ||
315 | , opPassphrases = withAgent $ do pfd <- maybeToList passfd | 315 | , opPassphrases = withAgent $ do pfd <- maybeToList passfd |
316 | return $ PassphraseSpec Nothing Nothing pfd | 316 | return $ PassphraseSpec Nothing Nothing pfd |
317 | , opHome=homespec, opTransforms = [] | 317 | , opHome=homespec, opTransforms = [] |