doImportG now takes subpackets instead of tag string

1 files changed, 7 insertions, 7 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index f97c37c..7e9fa17 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1330,7 +1330,7 @@ buildKeyDB ctx grip0 keyring = do
             r <- doImportG doDecrypt
                       db'
                       (fmap keykey $ maybeToList wk)
-                      tag
+                      [mkUsage tag]
                       fname
                       sub
             try r $ \(db'',report) -> do
@@ -1519,7 +1519,7 @@ doImport doDecrypt db (fname,subspec,ms,_) = do
         if (not (null tailms) || null m0)
             then return $ AmbiguousKeySpec fname
             else do
-                r <- doImportG doDecrypt db m0 tag fname key
+                r <- doImportG doDecrypt db m0 [mkUsage tag] fname key
                 try r $ \(db',report') -> do
                 return $ KikiSuccess (db',report++report')
 
@@ -1528,11 +1528,11 @@ doImportG
      (MappedPacket -> IO (KikiCondition Packet))
      -> Map.Map k KeyData
      -> [k]
-     -> [Char]
+     -> [SignatureSubpacket]
      -> [Char]
      -> Packet
      -> IO (KikiCondition (Map.Map k KeyData, [(FilePath,KikiReportAction)]))
-doImportG doDecrypt db m0 tag fname key = do
+doImportG doDecrypt db m0 tags fname key = do
     let kk = head m0
         Just (KeyData top topsigs uids subs) = Map.lookup kk db
         subkk = keykey key
@@ -1550,7 +1550,7 @@ doImportG doDecrypt db m0 tag fname key = do
         subs' = Map.insert subkk subkey subs
 
         istor = do
-            guard (tag == "tor")
+            guard ("tor" `elem` mapMaybe usage tags)
             return $ "Anonymous <root@" ++ take 16 (torhash key) ++ ".onion>"
 
     uids' <- flip (maybe $ return $ KikiSuccess (uids,[])) istor $ \idstr -> do
@@ -1587,10 +1587,10 @@ doImportG doDecrypt db m0 tag fname key = do
 
     let SubKey subkey_p subsigs = subkey
         wk = packet top
-        (xs',minsig,ys') = findTag [mkUsage tag] wk key subsigs
+        (xs',minsig,ys') = findTag tags wk key subsigs
         doInsert mbsig db = do
             -- NEW SUBKEY BINDING SIGNATURE
-            sig' <- makeSig doDecrypt top fname subkey_p [mkUsage tag] mbsig
+            sig' <- makeSig doDecrypt top fname subkey_p tags mbsig
             try sig' $ \(sig',report) -> do
             report <- return $ fmap (fname,) report ++ [(fname, YieldSignature)]
             let subs' = Map.insert subkk