import certificate blobs as 'x509cert@' binary annotations.

1 files changed, 8 insertions, 1 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 7e9fa17..8717e03 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1519,7 +1519,14 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
         if (not (null tailms) || null m0)
             then return $ AmbiguousKeySpec fname
             else do
-                r <- doImportG doDecrypt db m0 [mkUsage tag] fname key
+                let kk = keykey key
+                    cs = filter (\c -> kk==keykey (pcertKey c)) certs
+                    blobs = map mkCertNotation $ nub $ map pcertBlob cs
+                    mkCertNotation bs = NotationDataPacket
+                        { human_readable = False
+                        , notation_name = "x509cert@"
+                        , notation_value = Char8.unpack bs }
+                r <- doImportG doDecrypt db m0 (mkUsage tag:blobs) fname key
                 try r $ \(db',report') -> do
                 return $ KikiSuccess (db',report++report')