Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -36,15 +36,15 @@ namespace System.IdentityModel.Selectors
public CardSpacePolicyElement (
XmlElement target, XmlElement issuer,
Collection<XmlElement> parameters,
Uri policyNoticeLink,
int policyNoticeVersion,
Uri privacyNoticeLink,
int privacyNoticeVersion,
bool isManagedIssuer)
{
this.target = target;
this.issuer = issuer;
this.parameters = parameters ?? new Collection<XmlElement> ();
this.policy_link = policyNoticeLink;
policy_ver = policyNoticeVersion;
this.policy_link = privacyNoticeLink;
policy_ver = privacyNoticeVersion;
is_managed = isManagedIssuer;
}

View File

@@ -62,19 +62,19 @@ namespace System.IdentityModel.Selectors
[MonoTODO]
public static GenericXmlSecurityToken GetToken (
CardSpacePolicyElement [] policyChain,
SecurityTokenSerializer serializer)
SecurityTokenSerializer tokenSerializer)
{
return (GenericXmlSecurityToken) get_token.Invoke (impl, new object [] {policyChain, serializer});
return (GenericXmlSecurityToken) get_token.Invoke (impl, new object [] {policyChain, tokenSerializer});
}
public static GenericXmlSecurityToken GetToken (
XmlElement endpoint,
IEnumerable<XmlElement> policy,
XmlElement requiredRemoteTokenIssuer,
SecurityTokenSerializer serializer)
SecurityTokenSerializer tokenSerializer)
{
CardSpacePolicyElement pe = new CardSpacePolicyElement (endpoint, requiredRemoteTokenIssuer, new Collection<XmlElement> (new List<XmlElement> (policy)), null, 0, requiredRemoteTokenIssuer != null);
return GetToken (new CardSpacePolicyElement [] {pe}, serializer);
return GetToken (new CardSpacePolicyElement [] {pe}, tokenSerializer);
}
[MonoTODO]