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

18
mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs
View File

@ -75,30 +75,30 @@ namespace System.ServiceModel.Security.Tokens
}
public SecureConversationSecurityTokenParameters (
SecurityBindingElement element)
: this (element, true)
SecurityBindingElement bootstrapSecurityBindingElement)
: this (bootstrapSecurityBindingElement, true)
{
}
public SecureConversationSecurityTokenParameters (
SecurityBindingElement element,
SecurityBindingElement bootstrapSecurityBindingElement,
bool requireCancellation)
: this (element, requireCancellation, null)
: this (bootstrapSecurityBindingElement, requireCancellation, null)
{
}
#if !MOBILE && !XAMMAC_4_5
public SecureConversationSecurityTokenParameters (
SecurityBindingElement element,
SecurityBindingElement bootstrapSecurityBindingElement,
bool requireCancellation,
ChannelProtectionRequirements requirements)
ChannelProtectionRequirements bootstrapProtectionRequirements)
{
this.element = element;
this.element = bootstrapSecurityBindingElement;
this.cancellable = requireCancellation;
if (requirements == null)
if (bootstrapProtectionRequirements == null)
this.requirements = new ChannelProtectionRequirements (default_channel_protection_requirements);
else
this.requirements = new ChannelProtectionRequirements (requirements);
this.requirements = new ChannelProtectionRequirements (bootstrapProtectionRequirements);
}
#else
internal SecureConversationSecurityTokenParameters (