1 files changed, 13 insertions, 19 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 95c22d4..f97c37c 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1590,7 +1590,7 @@ doImportG doDecrypt db m0 tag fname key = do
         (xs',minsig,ys') = findTag [mkUsage tag] wk key subsigs
         doInsert mbsig db = do
             -- NEW SUBKEY BINDING SIGNATURE
-            sig' <- makeSig doDecrypt top fname subkey_p tag mbsig
+            sig' <- makeSig doDecrypt top fname subkey_p [mkUsage tag] mbsig
             try sig' $ \(sig',report) -> do
             report <- return $ fmap (fname,) report ++ [(fname, YieldSignature)]
             let subs' = Map.insert subkk
@@ -2599,10 +2599,10 @@ makeSig ::
   -> MappedPacket
   -> [Char]
   -> MappedPacket
-  -> [Char]
+  -> [SignatureSubpacket]
   -> Maybe (MappedPacket, Map.Map k a)
   -> IO (KikiCondition ((MappedPacket, Map.Map k a), [KikiReportAction]))
-makeSig doDecrypt top fname subkey_p tag mbsig = do
+makeSig doDecrypt top fname subkey_p tags mbsig = do
     let wk = packet top
     wkun <- doDecrypt top
     try wkun $ \wkun -> do
@@ -2614,19 +2614,17 @@ makeSig doDecrypt top fname subkey_p tag mbsig = do
             let mp' = mappedPacket fname new_sig
             return $ KikiSuccess (mp', Map.empty)
         parsedkey = [packet subkey_p]
-        hashed0 =
-                    [ KeyFlagsPacket
-                        { certify_keys = False
-                        , sign_data = False
-                        , encrypt_communication = False
-                        , encrypt_storage = False
-                        , split_key = False
-                        , authentication = True
-                        , group_key = False }
-                    , mkUsage tag
+        hashed0 = KeyFlagsPacket
+                    { certify_keys = False
+                    , sign_data = False
+                    , encrypt_communication = False
+                    , encrypt_storage = False
+                    , split_key = False
+                    , authentication = True
+                    , group_key = False }
+                    : tags
                     -- implicitly added:
                     -- , SignatureCreationTimePacket (fromIntegral timestamp)
-                    ]
         subgrip = fingerprint (head parsedkey)
 
     back_sig <- pgpSign (Message parsedkey)
@@ -2675,11 +2673,7 @@ makeSig doDecrypt top fname subkey_p tag mbsig = do
                         $ maybeToList $ do
                             e <- expires
                             return $ SignatureExpirationTimePacket (e - fromIntegral timestamp)
-            notation = NotationDataPacket
-                        { notation_name = "usage@"
-                        , notation_value = tag
-                        , human_readable = True }
-            sig' = sig { hashed_subpackets = times ++ [notation] ++ qs }
+            sig' = sig { hashed_subpackets = times ++ (qs `union` tags) }
         new_sig <- pgpSign (Message [wkun])
                            (SubkeySignature wk
                                             (packet subkey_p)