1 files changed, 20 insertions, 3 deletions

diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index f89aad2..96ad9ff 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -49,7 +49,7 @@ import qualified SSHKey                     as SSH
 import           CommandLine
 import           DotLock
 import           GnuPGAgent                 (Query (..))
-import qualified IntMapClass as I
+-- import qualified IntMapClass as I
 import           KeyRing hiding (pemFromPacket)
 import           KeyDB
 import           KeyRing.BuildKeyDB (gpgipv6addr, Hostnames, allNames)
@@ -104,7 +104,22 @@ refresh root homepass = do
         KikiSuccess rt -> refreshCache rt mroot
         _              -> return () -- XXX: silent fail?
 
-data CommonArgsParsed = CommonArgsParsed { cap_homespec :: Maybe String, cap_passfd :: Maybe InputFile }
+data CommonArgsParsed = CommonArgsParsed
+    { cap_homespec :: Maybe String
+    , cap_passfd :: Maybe InputFile
+    , cap_fpstyle :: FingerprintStyle
+    }
+
+data FingerprintStyle
+    = FingerprintAuto
+    | Fingerprint5
+ deriving (Eq,Ord,Show)
+
+instance Read FingerprintStyle where
+    readsPrec _ s = case break isSpace s of
+        ("auto",t) -> [(FingerprintAuto, drop 1 t)]
+        ("5",t)    -> [(Fingerprint5, drop 1 t)]
+        _          -> []
 
 streaminfo :: StreamInfo
 streaminfo = StreamInfo
@@ -519,7 +534,8 @@ refreshCache rt rootdir = do
     let exportOp = passphrases <> pemSecrets
                                <> minimalOp False
                                             (CommonArgsParsed (Just $ takeDirectory $ rtPubring rt)
-                                                              Nothing)
+                                                              Nothing
+                                                              FingerprintAuto)
          where
           passphrases = mempty { opPassphrases = [PassphraseMemoizer (rtPassphrases rt)] }
           pemSecrets = mempty { opFiles = Map.fromList
@@ -712,6 +728,7 @@ dashdashHomedir :: Args CommonArgsParsed
 dashdashHomedir = CommonArgsParsed
                 <$> optional (arg "--homedir")
                 <*> optional (FileDesc <$> read <$> arg "--passphrase-fd")
+                <*> (fromMaybe FingerprintAuto <$> optional (read <$> arg "--fingerprint"))
 
 dashdashCipher :: Args SymmetricAlgorithm
 dashdashCipher = fromMaybe CAST5 <$> optional (cipherFromString <$> arg "--cipher")