diff options
author | joe <joe@jerkface.net> | 2014-05-09 23:54:52 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-05-09 23:54:52 -0400 |
commit | bb5dbf01160084e4639583221a4c084f96e8c06e (patch) | |
tree | 91f2a631ee849389d51885b771da66192d7a9656 | |
parent | f4d32f7692b2699e7136e5dd267382193b005bb4 (diff) |
TODO comment
-rw-r--r-- | KeyRing.hs | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1504,10 +1504,9 @@ doImport doDecrypt db (fname,subspec,ms,_) = do | |||
1504 | flip (maybe $ return CannotImportMasterKey) | 1504 | flip (maybe $ return CannotImportMasterKey) |
1505 | subspec $ \tag -> do | 1505 | subspec $ \tag -> do |
1506 | ps <- readSecretPEMFile (ArgFile fname) | 1506 | ps <- readSecretPEMFile (ArgFile fname) |
1507 | let parsedkey = mapMaybe spemPacket ps | 1507 | foldM (importPemThing tag) (KikiSuccess (db,[])) ps |
1508 | foldM (importPemThing tag) (KikiSuccess (db,[])) parsedkey | ||
1509 | where | 1508 | where |
1510 | importPemThing tag prior key = do | 1509 | importPemThing tag prior (PEMPacket key) = do |
1511 | try prior $ \(db,report) -> do | 1510 | try prior $ \(db,report) -> do |
1512 | let (m0,tailms) = splitAt 1 ms | 1511 | let (m0,tailms) = splitAt 1 ms |
1513 | if (not (null tailms) || null m0) | 1512 | if (not (null tailms) || null m0) |
@@ -1516,6 +1515,13 @@ doImport doDecrypt db (fname,subspec,ms,_) = do | |||
1516 | r <- doImportG doDecrypt db m0 tag fname key | 1515 | r <- doImportG doDecrypt db m0 tag fname key |
1517 | try r $ \(db',report') -> do | 1516 | try r $ \(db',report') -> do |
1518 | return $ KikiSuccess (db',report++report') | 1517 | return $ KikiSuccess (db',report++report') |
1518 | importPemThing tag prior (PEMCertificate cert) = do | ||
1519 | -- TODO Probably we need to move to a new design where signature | ||
1520 | -- packets are merged into the database in one phase with null | ||
1521 | -- signatures, and then the signatures are made in the next phase. | ||
1522 | -- This would let us merge annotations (like certificates) from | ||
1523 | -- seperate files. | ||
1524 | return prior | ||
1519 | 1525 | ||
1520 | doImportG | 1526 | doImportG |
1521 | :: Ord k => | 1527 | :: Ord k => |