From 9cc0b24375b6b40eb7c3412983e75b6e3fe3a3f6 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Tue, 19 May 2020 17:40:39 -0400
Subject: Commandline option to use v5 key packets.

---
 kiki.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'kiki.hs')

diff --git a/kiki.hs b/kiki.hs
index d4d4084..451552c 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1568,8 +1568,9 @@ kiki "init" args | "--help" `elem` args = do
     putStr . unlines $
         [ "kiki init [ --passphrase-fd=FD"
         , "          | --homedir[=HOMEDIR]"
-        , "          | --chroot=ROOTDIR ]"
-        , "          | --cipher="++intercalate "|" (map ciphername ciphers)++" ] ..."
+        , "          | --chroot=ROOTDIR"
+        , "          | --cipher="++intercalate "|" (map ciphername ciphers)
+        , "          | -(4|5) ] ..."
         , ""
         , "Modify your GnuPG keyring and update /var/cache/kiki.  The following"
         , "changes will occur to the keyring:"
@@ -1589,10 +1590,16 @@ kiki "init" args | "--help" `elem` args = do
         , "                variable is ignored and you must use --homedir to specify"
         , "                a value other than /root/.gnupg."
         , ""
+        , "     -4"
+        , "                New PGP key packets should use the v4 (default) format."
+        , ""
+        , "     -5"
+        , "                New PGP key packets should use the v5 format and use the"
+        , "                SHA256-based v5 fingerprints."
         , ""
         ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
 
-kiki "init" args = run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
+kiki "init" args = run args $ importAndRefresh <$> dashdashPGPVersion <*> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
 kiki "spawn" args | "--help" `elem` args =
     putStr . unlines $
         [ "kiki spawn [ --passphrase-fd=FD"
-- 
cgit v1.2.3