2010-07-09 Atsushi Enomoto <atsushi@ximian.com>

	* SecurityRequestChannel.cs : do not try to decrypt faults, they
	  are not encrypted.

svn path=/trunk/mcs/; revision=160126

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
index 03d52c98ad832dba2ae7630ac3d9b68543f052d5..2b55c975ee6ba7176d3cb98e715a139becd1c1d9 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-09  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * SecurityRequestChannel.cs : do not try to decrypt faults, they
+         are not encrypted.
+
 2010-07-09  Atsushi Enomoto  <atsushi@ximian.com>
 
        * MessageHeader.cs : to clone raw xml completely, avoid using 

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityRequestChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityRequestChannel.cs
index 3a94b59fdd9f8aa86c1d32b271f72319ab5fd060..9126fb241c6384623350bc0e5291fb8651ae4d20 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityRequestChannel.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityRequestChannel.cs
@@ -132,7 +132,7 @@ namespace System.ServiceModel.Channels
                Message ProcessReply (Message message, SecurityMessageProperty secprop)
                {
                        // FIXME: provide correct parameters
-                       return new InitiatorSecureMessageDecryptor (message, secprop, security).DecryptMessage ();
+                       return message.IsFault ? message : new InitiatorSecureMessageDecryptor (message, secprop, security).DecryptMessage ();
                }
 
                void AcquireSecurityKey (object o, EventArgs e)