1 files changed, 11 insertions, 5 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 49a6069..a15fdeb 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1360,11 +1360,13 @@ performManipulations doDecrypt operation rt wk = do
         flip (maybe $ return NoWorkingKey) wk $ \wk' -> do
         wkun' <- doDecrypt wk'
         try wkun' $ \wkun -> do    
-        let sigOver = makeInducerSig (keyPacket kd) wkun (UserIDPacket uid) subpaks
-        sigr <- pgpSign (Message [wkun]) sigOver SHA1 (fingerprint wkun)
-        let f ::([SigAndTrust],OriginMap) -> ([SigAndTrust],OriginMap)
-            f x = ( map ( (,Map.empty) . toMappedPacket om) (additional sigr) ++ fst x
-                  , om `Map.union` snd x )
+        let flgs = if keykey (keyPacket kd) == keykey wkun
+                    then keyFlags0 (keyPacket kd) (map (\(x,_,_)->x) selfsigs)
+                    else []
+            sigOver = makeInducerSig (keyPacket kd)
+                                     wkun
+                                     (UserIDPacket uid)
+                                     $ flgs ++ subpaks
             om = Map.singleton "--autosign" (origin p (-1)) where p = UserIDPacket uid
             toMappedPacket om p = (mappedPacket "" p) {locations=om}
             selfsigs = filter (\(sig,v,whosign) -> isJust (v >> Just wkun >>= guard
@@ -1388,6 +1390,10 @@ performManipulations doDecrypt operation rt wk = do
                 new_sig <- maybeToList new_sig
                 guard (null $ selfsigs)
                 signatures_over new_sig
+        sigr <- pgpSign (Message [wkun]) sigOver SHA1 (fingerprint wkun)
+        let f ::([SigAndTrust],OriginMap) -> ([SigAndTrust],OriginMap)
+            f x = ( map ( (,Map.empty) . toMappedPacket om) (additional sigr) ++ fst x
+                  , om `Map.union` snd x )
         return $ KikiSuccess $ kd { rentryUids = Map.adjust f uid (rentryUids kd) }
 
 initializeMissingPEMFiles ::