1 files changed, 16 insertions, 3 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index e3d41d8..ced1994 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -479,6 +479,9 @@ buildKeyDB secring pubring grip0 keyring = do
     let isring (KeyRingFile {}) = True
         isring _                = False
 
+        getUsage (PEMFile usage) = return usage
+        getUsage _               = mzero
+
         iswallet WalletFile = True
         iswallet _          = False
 
@@ -526,13 +529,23 @@ buildKeyDB secring pubring grip0 keyring = do
             try r $ \(db'',report) -> do
             return $ KikiSuccess (db'', report0 ++ report)
 
+        importPEMKey db' tup = do
+            try db' $ \(db',report0) -> do
+            r <- doImport doDecrypt 
+                      db'
+                      tup
+            try r $ \(db'',report) -> do
+            return $ KikiSuccess (db'', report0 ++ report)
+
     db <- foldM importWalletKey (KikiSuccess (db_rings,[])) wallet_keys
-    try db $ \(db,report) -> do
+    try db $ \(db,reportWallets) -> do
 
     -- todo: import PEMFiles
-    -- use_db <- foldM (doImport decrypt) use_db0 (map snd imports)
+    let imports = todo
+    db <- foldM importPEMKey (KikiSuccess (db,[])) (map snd imports)
+    try db $ \(db,reportPEMs) -> do
 
-    return $ KikiSuccess ( (db, grip, wk), report )
+    return $ KikiSuccess ( (db, grip, wk), reportWallets ++ reportPEMs )
 
 torhash key = maybe "" id $ derToBase32 <$> derRSA key