Author: atsushi
Date: 2007-02-06 08:12:16 -0500 (Tue, 06 Feb 2007)
New Revision: 72353
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
Log:
2007-02-06 Atsushi Enomoto <[EMAIL PROTECTED]>
* SecureMessageGenerator.cs :
make SignBeforeEncryptAndEncryptSignature working.
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
2007-02-06 12:18:03 UTC (rev 72352)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
2007-02-06 13:12:16 UTC (rev 72353)
@@ -1,5 +1,10 @@
2007-02-06 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * SecureMessageGenerator.cs :
+ make SignBeforeEncryptAndEncryptSignature working.
+
+2007-02-06 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* SecureMessageGenerator.cs : EncryptedKeySHA1 needs key hash, not
the key itself. ProtectionToken is WrappedKey.
* SecureMessageDecryptor.cs : now it is internal encrypted key clause,
Modified:
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
===================================================================
---
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
2007-02-06 12:18:03 UTC (rev 72352)
+++
trunk/olive/class/System.ServiceModel/System.ServiceModel.Channels/SecureMessageGenerator.cs
2007-02-06 13:12:16 UTC (rev 72353)
@@ -457,12 +457,6 @@
// encRefList = refList;
EncryptedData edata = Encrypt (body, pkey,
ekeyId, refList, encClause, exml, doc);
- if (ShouldOutputEncryptedKey)
- edata.KeyInfo = null;
- else {
- edata.KeyInfo = new KeyInfo ();
- edata.KeyInfo.AddClause (new
SecurityTokenReferenceKeyInfo (ekeyClause, serializer, doc));
- }
EncryptedXml.ReplaceElement (body, edata,
false);
// encrypt signature
@@ -594,6 +588,14 @@
DataReference dr = new DataReference ();
dr.Uri = "#" + edata.Id;
refList.Add (dr);
+
+ if (ShouldOutputEncryptedKey)
+ edata.KeyInfo = null;
+ else {
+ edata.KeyInfo = new KeyInfo ();
+ edata.KeyInfo.AddClause (new
SecurityTokenReferenceKeyInfo (encClause, serializer, doc));
+ }
+
return edata;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
