Fixed --working key output

1 files changed, 7 insertions, 0 deletions

diff --git a/kiki.hs b/kiki.hs
index b39338d..fa45aa1 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -271,6 +271,7 @@ show_wk secring_file grip db = do
     let sec_db = Map.filter gripmatch db
         gripmatch (KeyData p _ _ _) =
             Map.member secring_file (locations p)
+            || Map.member "&secret" (locations p)
         Message sec = flattenKeys False sec_db
     putStrLn $ listKeysFiltered (maybeToList grip) sec
 
@@ -1168,6 +1169,9 @@ kiki "init-key" args = do
         sshcpath0 = fromMaybe "" rootdir ++ "/root/.ssh/id_rsa"
         sshspath0 = fromMaybe "" rootdir ++ "/etc/ssh/ssh_host_rsa_key"
         ipsecpath0 = fromMaybe "" rootdir ++ "/etc/ipsec.d/private/%(onion).pem"
+        sshcpathpub0 = fromMaybe "" rootdir ++ "/root/.ssh/id_rsa.pub"
+        sshspathpub0 = fromMaybe "" rootdir ++ "/etc/ssh/ssh_host_rsa_key.pub"
+        ipsecpathpub0 = fromMaybe "" rootdir ++ "/etc/ipsec.d/certs/%(onion).pem"
     
     -- First, we ensure that the tor key exists and is imported
     -- so that we know where to put the strongswan key.
@@ -1226,6 +1230,7 @@ kiki "init-key" args = do
     
     -- Finally, export public keys if they do not exist.
     flip (maybe $ warn "missing working key?") (rtGrip rt) $ \grip -> do
+    -- TODO: the .pub file paths should be read from config also
     gotc <- doesFileExist (sshcpath++".pub")
     when (not gotc) $ do
         either warn (writeFile $ sshcpath++".pub")
@@ -1235,6 +1240,8 @@ kiki "init-key" args = do
         either warn (writeFile $ sshspath++".pub")
             $ show_ssh' "ssh-host" grip (rtKeyDB rt)
 
+    -- TODO: strongswan public /etc/ipsec.d/certs/%(onion).pem
+
     return ()
 
 splitArg :: String -> Either (String,Maybe String) String