export secret keys as pem files

2 files changed, 19 insertions, 10 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 2f8f6ec..6fa97d5 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -88,7 +88,7 @@ type UsageTag = String
 type Initializer = String
 type PassWordFile = InputFile
 
-data FileType = KeyRingFile PassWordFile
+data FileType = KeyRingFile (Maybe PassWordFile)
               | PEMFile UsageTag
               | WalletFile -- (Maybe UsageTag)
 
@@ -101,7 +101,7 @@ isring (KeyRingFile {}) = True
 isring _                = False
 
 pwfile (KeyRingFile f) = f
-pwfile _               = HomeSec
+pwfile _               = Nothing
 
 iswallet (WalletFile {}) = True
 iswallet _               = False
@@ -279,6 +279,7 @@ data KikiReportAction =
         | ExternallyGeneratedFile
         | UnableToExport KeyAlgorithm String
         | FailedFileWrite
+ deriving Show
 
 data KikiResult a = KikiResult
     { kikiCondition :: KikiCondition a
@@ -1173,9 +1174,9 @@ runKeyRing keyring = do
             -- TODO: head will throw an exception if a File Descriptor keyring
             -- file is present.  We probably should change OriginMap to use InputFile
             -- instead of FilePath.
-            Traversable.mapM (cachedContents secring pubring . pwfile . snd)
+            Traversable.mapM (cachedContents secring pubring . fromJust . pwfile . snd)
                              (Map.mapKeys (head . resolveInputFile secring pubring)
-                                $ Map.filter (isring . snd) $ kFiles keyring)
+                                $ Map.filter (isJust . pwfile . snd) $ kFiles keyring)
 
         unkeysRef <- newIORef Map.empty
 
diff --git a/kiki.hs b/kiki.hs
index c29076a..42b1d98 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1232,8 +1232,8 @@ main = do
     let keypairs = catMaybes keypairs0
         btcpairs = catMaybes btcpairs0
 
-    {-
     putStrLn $ "keypairs = "++show keypairs
+    {-
     putStrLn $ "publics  = "++show publics
     putStrLn $ "keyrings = "++show keyrings
     -}
@@ -1324,19 +1324,25 @@ main = do
             return db'
 
     let homespec = join . take 1 <$> Map.lookup "--homedir" margs
+        passfd = fmap (FileDesc . read) passphrase_fd
+        pems = flip map keypairs 
+                $ \(usage,path,cmd) ->
+                    let cmd' = guard (not $ null cmd) >> return cmd
+                    in (ArgFile path, (MutableRef cmd', PEMFile usage)) 
         kikiOp = KeyRingData
-            { kFiles = Map.fromList
-                [ ( HomeSec, (ConstRef, KeyRingFile (FileDesc 8)) )
-                , ( HomePub, (ConstRef, KeyRingFile (FileDesc 8)) )
+            { kFiles = Map.fromList $
+                [ ( HomeSec, (MutableRef Nothing, KeyRingFile passfd)  )
+                , ( HomePub, (MutableRef Nothing, KeyRingFile Nothing) )
                 ]
+                ++ pems
             , kImports = Map.empty
             , homeSpec = homespec
             }
 
-    rt <- runKeyRing kikiOp 
+    KikiResult rt report <- runKeyRing kikiOp 
 
     case rt of
-      KikiResult (KikiSuccess rt) _ -> do -- interpret --show-* commands.
+      KikiSuccess rt -> do -- interpret --show-* commands.
             let grip = rtGrip rt
             let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip)
                                       ,("--show-all",const $ show_all)
@@ -1349,7 +1355,9 @@ main = do
                 shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs
 
             forM_ shargs $ \(cmd,args) -> cmd args (rtKeyDB rt)
+      e -> putStrLn $ show (fmap (const ()) e)
 
+    putStrLn $ show report
     return()
  where