1 files changed, 12 insertions, 6 deletions

diff --git a/kiki.hs b/kiki.hs
index 2ea702f..e06fa79 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1496,7 +1496,7 @@ kiki "init" args = do
                         HomeSec
                         ( encode $ Message [mk { is_subkey = False }] )
         -}
-        master <- generateKey (GenRSA $ 4096 `div` 8 )
+        master <- (\k -> k { is_subkey = False }) <$> generateKey (GenRSA $ 4096 `div` 8 )
         writeInputFileL (InputFileContext secring pubring)
                         HomeSec
                         $ encode $ Message [master { is_subkey = False}]
@@ -1523,6 +1523,12 @@ kiki "init" args = do
     -- First, we ensure that the tor key exists and is imported
     -- so that we know where to put the strongswan key.
     let passfd = fmap (FileDesc . read) $ lookup "passphrase-fd" args
+        strm = StreamInfo { typ = KeyRingFile
+                          , fill = KF_None
+                          , spill = KF_All
+                          , access = AutoAccess
+                          , initializer = NoCreate
+                          , transforms = [] }
         buildStreamInfo rtyp ftyp = StreamInfo { typ = ftyp
                                                , fill = rtyp
                                                , spill = KF_All
@@ -1531,7 +1537,7 @@ kiki "init" args = do
                                                , transforms = [] }
         peminfo bits usage =
                   StreamInfo { typ = PEMFile
-                             , fill = KF_Match usage
+                             , fill = KF_None -- KF_Match usage
                              , spill = KF_Match usage
                              , access = Sec
                              , initializer = Internal (GenRSA $ bits `div` 8)
@@ -1543,10 +1549,10 @@ kiki "init" args = do
              { opFiles = Map.fromList $
                 [ ( HomeSec, buildStreamInfo KF_All KeyRingFile )
                 , ( HomePub, (buildStreamInfo KF_All KeyRingFile) { access = Pub } )
-                , ( Generate (GenRSA (1024 `div` 8)), peminfo 1024 "tor"   )
-                , ( Generate (GenRSA (1024 `div` 8)), peminfo 1024 "ipsec" )
-                , ( ArgFile sshcpath, (peminfo 2048 "ssh-client") { fill = KF_None } )
-                , ( ArgFile sshspath, (peminfo 2048 "ssh-server") { fill = KF_None } )
+                , ( Generate 0 (GenRSA (1024 `div` 8)), strm { spill = KF_Match "tor" })
+                , ( Generate 1 (GenRSA (1024 `div` 8)), strm { spill = KF_Match "ipsec" })
+                , ( ArgFile sshcpath, (peminfo 2048 "ssh-client") )
+                , ( ArgFile sshspath, (peminfo 2048 "ssh-server") )
                 ]
              , opPassphrases = do pfd <- maybeToList passfd
                                   return $ PassphraseSpec Nothing Nothing pfd