1 files changed, 6 insertions, 4 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index f4c4a2b..222c1bb 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -214,6 +214,7 @@ importAndRefresh root cmn cipher = do
     let homespec = mplus (slash <$> rootdir <*> cap_homespec cmn)
                          (fmap (++"/root/.gnupg") rootdir)
         passfd = cap_passfd cmn
+        pgpver = preferredPGPVersion $ minimalOp False cmn
     (home,secring,pubring,mbwk) <- unconditionally $ getHomeDir homespec
     osHomeDir <- if bUnprivileged then getHomeDirectory else return "/root"
 
@@ -224,13 +225,14 @@ importAndRefresh root cmn cipher = do
         -- Since 'runKeyRing' cannot currently cope with this situation, we will
         -- generate a master-key and very minimal secring.gpg file.
         master_un <- generateKey (GenRSA $ 4096 `div` 8 )
-            <&> \k -> MappedPacket (k { is_subkey = False }) -- Set as master-key.
+            <&> \k -> MappedPacket (k { is_subkey = False     -- Set as master-key.
+                                      , version   = pgpver }) -- Set pgp packet version.
                                    Map.empty                 -- Packet occurs in no files.
         -- The user may desire the master key is encrypted on disk but this
         -- requires a password prompt.  In order to have a decent prompt, it'd
         -- be nice if we could display the .onion hostname for the key.
         -- Therefore, we generate the tor key early.
-        tor_un <- generateKey (GenRSA $ 1024 `div` 8 )
+        tor_un <- fmap (\k -> k { version = pgpver }) $ generateKey (GenRSA $ 1024 `div` 8 )
         -- However, we'll postpone writing the tor key to the keyring and
         -- instead have the later all-in-one call to runKeyRing take care of
         -- it.  That interface does not currently provide a way to accept
@@ -270,7 +272,7 @@ importAndRefresh root cmn cipher = do
                 writeInputFileL ctx
                                 HomeSec
                                 $ encode $ Message [master]
-                putStrLn "Wrote master key"
+                putStrLn $ "Wrote master key."
                 return (FileDesc read_tor, [PassphraseMemoizer transcoder])
             er -> do
                 hPutStrLn stderr ("warning: " ++ errorString er)
@@ -279,7 +281,7 @@ importAndRefresh root cmn cipher = do
                 writeInputFileL ctx
                                 HomeSec
                                 $ encode $ Message [packet master_un]
-                putStrLn "Wrote master key"
+                putStrLn $ "Wrote unencrypted master key."
                 return (FileDesc read_tor, [])
 
     -- If the public ring does not exist, then creating an empty file is