From b418ea873b6390bee1247e5a1e9cd868fcc638f1 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Mon, 1 Jul 2019 03:08:58 -0400
Subject: More merging of 0bc53f99cfd70f3a18802604d7ef3174d004db4c.

---
 lib/Kiki.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/Kiki.hs')

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
-- 
cgit v1.2.3