Author: atsushi
Date: 2007-02-27 00:42:01 -0500 (Tue, 27 Feb 2007)
New Revision: 73453

Modified:
   trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
   
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/MessageSecurityBindingSupport.cs
   
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
Log:
2007-02-27  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * MessageSecurityBindingSupport.cs : so, those supporting tokens are
          totally signing tokens.
        * SecureMessageGenerator.cs : Endorsing tokens should also be
          included in the message. They are just not signed.



Modified: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog    
    2007-02-27 00:11:53 UTC (rev 73452)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog    
    2007-02-27 05:42:01 UTC (rev 73453)
@@ -1,3 +1,10 @@
+2007-02-27  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * MessageSecurityBindingSupport.cs : so, those supporting tokens are
+         totally signing tokens.
+       * SecureMessageGenerator.cs : Endorsing tokens should also be
+         included in the message. They are just not signed.
+
 2007-02-26  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * SecureMessageGenerator.cs : support signing and encryption of

Modified: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/MessageSecurityBindingSupport.cs
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/MessageSecurityBindingSupport.cs
 2007-02-27 00:11:53 UTC (rev 73452)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/MessageSecurityBindingSupport.cs
 2007-02-27 05:42:01 UTC (rev 73453)
@@ -212,13 +212,13 @@
                        bool required)
                {
                        foreach (SecurityTokenParameters p in s.Signed)
-                               l.Add (new SupportingTokenInfo 
(GetExchangeToken (p), SecurityTokenAttachmentMode.Signed, required));
+                               l.Add (new SupportingTokenInfo (GetSigningToken 
(p), SecurityTokenAttachmentMode.Signed, required));
                        foreach (SecurityTokenParameters p in s.Endorsing)
                                l.Add (new SupportingTokenInfo (GetSigningToken 
(p), SecurityTokenAttachmentMode.Endorsing, required));
                        foreach (SecurityTokenParameters p in s.SignedEndorsing)
                                l.Add (new SupportingTokenInfo (GetSigningToken 
(p), SecurityTokenAttachmentMode.SignedEndorsing, required));
                        foreach (SecurityTokenParameters p in s.SignedEncrypted)
-                               l.Add (new SupportingTokenInfo 
(GetExchangeToken (p), SecurityTokenAttachmentMode.SignedEncrypted, required));
+                               l.Add (new SupportingTokenInfo (GetSigningToken 
(p), SecurityTokenAttachmentMode.SignedEncrypted, required));
                }
 
                SecurityToken GetSigningToken (SecurityTokenParameters p)

Modified: 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
===================================================================
--- 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
        2007-02-27 00:11:53 UTC (rev 73452)
+++ 
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
        2007-02-27 05:42:01 UTC (rev 73453)
@@ -412,11 +412,8 @@
                                security.CollectSupportingTokens (GetAction ()) 
:
                                new SupportingTokenInfoCollection (); // empty
 
-                       foreach (SupportingTokenInfo tinfo in tokenInfos) {
-                               if (tinfo.Mode == 
SecurityTokenAttachmentMode.Endorsing)
-                                       continue;
+                       foreach (SupportingTokenInfo tinfo in tokenInfos)
                                header.Contents.Add (tinfo.Token);
-                       }
 
                        // populate DOM to sign.
                        XPathNavigator nav = doc.CreateNavigator ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to