mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.182

Browse Source 
Former-commit-id: 439c182e520038bf50777ca2fe684f216ae28552
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-01 10:46:18 +00:00
parent c911219690
commit 804b15604f
118 changed files with 1007 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mcs/class/System.ServiceModel/System.ServiceModel.Channels/SecurityBindingElement.cs
View File

@ -531,29 +531,29 @@ namespace System.ServiceModel.Channels
#endif
public static SecurityBindingElement
CreateSecureConversationBindingElement (SecurityBindingElement binding)
CreateSecureConversationBindingElement (SecurityBindingElement bootstrapSecurity)
{
return CreateSecureConversationBindingElement (binding, false);
return CreateSecureConversationBindingElement (bootstrapSecurity, false);
}
public static SecurityBindingElement
CreateSecureConversationBindingElement (
SecurityBindingElement binding, bool requireCancellation)
SecurityBindingElement bootstrapSecurity, bool requireCancellation)
{
return CreateSecureConversationBindingElement (binding, requireCancellation, null);
return CreateSecureConversationBindingElement (bootstrapSecurity, requireCancellation, null);
}
public static SecurityBindingElement
CreateSecureConversationBindingElement (
SecurityBindingElement binding, bool requireCancellation,
ChannelProtectionRequirements protectionRequirements)
SecurityBindingElement bootstrapSecurity, bool requireCancellation,
ChannelProtectionRequirements bootstrapProtectionRequirements)
{
#if !NET_2_1 && !XAMMAC_4_5
SymmetricSecurityBindingElement be =
new SymmetricSecurityBindingElement ();
be.ProtectionTokenParameters =
new SecureConversationSecurityTokenParameters (
binding, requireCancellation, protectionRequirements);
bootstrapSecurity, requireCancellation, bootstrapProtectionRequirements);
return be;
#else
throw new NotImplementedException ();