More merging of 0bc53f99cfd70f3a18802604d7ef3174d004db4c.

4 files changed, 4 insertions, 33 deletions

diff --git a/kiki.hs b/kiki.hs
index e5544e5..fa22451 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1548,7 +1548,7 @@ kiki "init" args | "--help" `elem` args = do
         , ""
         ] ++ documentHomeDir ++ [""] ++ documentPassphraseFDFlag True True True
 
-kiki "init" args = run args $ importAndRefresh <$> opt_chroot <*> opt_homedir <*> opt_cipher
+kiki "init" args = run args $ importAndRefresh <$> dashdashChroot <*> dashdashHomedir <*> dashdashCipher
 
 kiki "delete" args | "--help" `elem` args = do
     putStr . unlines $
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs
index 69410ad..2c6b782 100644
--- a/lib/KeyRing.hs
+++ b/lib/KeyRing.hs
@@ -24,7 +24,7 @@
 {-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# LANGUAGE LambdaCase #-}
-module KeyRing (module KeyRing.Types, module KeyRing, module KeyRing.BuildKeyDB) where
+module KeyRing (module KeyRing.Types, module Transforms, module PacketTranscoder, module KeyRing, module KeyRing.BuildKeyDB) where
 
 import System.Environment
 import Control.Monad
diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index 6de217b..d8f8d50 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -1042,17 +1042,6 @@ secp256k1_id = 0x2b8104000a
 -}
 
 
-keyCompare :: String -> Packet -> Packet -> Ordering
-keyCompare what (SecretKeyPacket {}) (PublicKeyPacket {}) = LT
-keyCompare what (PublicKeyPacket {}) (SecretKeyPacket {}) = GT
-keyCompare what a b | keykey a==keykey b = EQ
-keyCompare what a b = error $ unlines ["Unable to merge "++what++":"
-                              , fingerprint a
-                              , PP.ppShow a
-                              , fingerprint b
-                              , PP.ppShow b
-                              ]
-
 
 dbInsertPacket :: KeyData -> FilePath -> (Int,(Packet,Packet,(Packet,Map.Map FilePath Packet))) -> Maybe KeyData
 dbInsertPacket kd filename (n,(top,sub,ptt@(p,trustmap))) = update (Just kd)
@@ -1119,24 +1108,6 @@ dbInsertPacket kd filename (n,(top,sub,ptt@(p,trustmap))) = update (Just kd)
     mergeSubSig n sig Nothing = error $
         "Unable to merge subkey signature: "++(words (show sig) >>= take 1)
 
-secretToPublic :: Packet -> Packet
-secretToPublic pkt@(SecretKeyPacket {}) =
-    PublicKeyPacket { version = version pkt
-                    , timestamp = timestamp pkt
-                    , key_algorithm = key_algorithm pkt
-                    -- , ecc_curve = ecc_curve pkt
-                    , key = let seckey = key pkt
-                                pubs = public_key_fields (key_algorithm pkt)
-                            in filter (\(k,v) -> k `elem` pubs) seckey
-                    , is_subkey = is_subkey pkt
-                    , v3_days_of_validity = Nothing
-                    }
-secretToPublic pkt = pkt
-
-
-ifSecret :: Packet -> t -> t -> t
-ifSecret (SecretKeyPacket {}) t f = t
-ifSecret _                    t f = f
 
 instance ASN1Object RSAPrivateKey where
     toASN1 rsa@(RSAPrivateKey {})
diff --git a/lib/Kiki.hs b/lib/Kiki.hs
index 27ebbcd..828a251 100644
--- a/lib/Kiki.hs
+++ b/lib/Kiki.hs
@@ -45,7 +45,7 @@ import qualified SSHKey                     as SSH
 import           CommandLine
 import           DotLock
 import           GnuPGAgent                 (Query (..))
-import           KeyRing
+import           KeyRing hiding (pemFromPacket)
 
 withAgent :: [PassphraseSpec] -> [PassphraseSpec]
 withAgent [] = [PassphraseAgent]
@@ -171,7 +171,7 @@ importAndRefresh root cmn cipher = do
 
     let passfd = cap_passfd cmn
 
-    (torgen,pwds) <- bool id (const $ return (Generate 0 $ GenRSA $ 1024 `div` 8, [])) $ do
+    (torgen,pwds) <- bool id (const $ return (Generate 0 $ GenRSA $ 1024 `div` 8, [])) gotsec $ do
         {-  ssh-keygen to create master key...
         let mkpath = home ++ "/master-key"
         mkdirFor mkpath