TODO comment

1 files changed, 9 insertions, 3 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index f7a1a12..ca08a65 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1504,10 +1504,9 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
     flip (maybe $ return CannotImportMasterKey)
          subspec $ \tag -> do
     ps <- readSecretPEMFile (ArgFile fname)
-    let parsedkey = mapMaybe spemPacket ps
-    foldM (importPemThing tag) (KikiSuccess (db,[])) parsedkey
+    foldM (importPemThing tag) (KikiSuccess (db,[])) ps
  where
-    importPemThing tag prior key = do
+    importPemThing tag prior (PEMPacket key) = do
         try prior $ \(db,report) -> do
         let (m0,tailms) = splitAt 1 ms
         if (not (null tailms) || null m0)
@@ -1516,6 +1515,13 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
                 r <- doImportG doDecrypt db m0 tag fname key
                 try r $ \(db',report') -> do
                 return $ KikiSuccess (db',report++report')
+    importPemThing tag prior (PEMCertificate cert) = do
+        -- TODO Probably we need to move to a new design where signature
+        -- packets are merged into the database in one phase with null
+        -- signatures, and then the signatures are made in the next phase.
+        -- This would let us merge annotations (like certificates) from
+        -- seperate files.
+        return prior
 
 doImportG
   :: Ord k =>