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

@ -53,16 +53,16 @@ namespace System.IdentityModel.Tokens
}
public SamlAssertion (string assertionId, string issuer,
DateTime issueInstant, SamlConditions conditions,
SamlAdvice advice, IEnumerable<SamlStatement> statements)
DateTime issueInstant, SamlConditions samlConditions,
SamlAdvice samlAdvice, IEnumerable<SamlStatement> samlStatements)
{
if (IsInvalidAssertionId (assertionId))
throw new ArgumentException (String.Format ("The assertionId '{0}' must be a valid XML NCName.", assertionId));
if (issuer == null || issuer.Length == 0)
throw new ArgumentException ("issuer");
if (statements == null)
throw new ArgumentNullException ("statements");
if (samlStatements == null)
throw new ArgumentNullException ("samlStatements");
major = 1;
minor = 1;
@ -70,9 +70,9 @@ namespace System.IdentityModel.Tokens
assertion_id = assertionId;
this.issuer = issuer;
issue_instant = issueInstant;
this.conditions = conditions;
this.advice = advice;
foreach (SamlStatement s in statements) {
this.conditions = samlConditions;
this.advice = samlAdvice;
foreach (SamlStatement s in samlStatements) {
if (s == null)
throw new ArgumentException ("statements contain null item.");
this.statements.Add (s);
@ -180,7 +180,7 @@ namespace System.IdentityModel.Tokens
[MonoTODO]
public virtual void ReadXml (XmlDictionaryReader reader,
SamlSerializer samlSerializer,
SecurityTokenSerializer keyInfoTokenSerializer,
SecurityTokenSerializer keyInfoSerializer,
SecurityTokenResolver outOfBandTokenResolver)
{
throw new NotImplementedException ();
@ -188,7 +188,7 @@ namespace System.IdentityModel.Tokens
public virtual void WriteXml (XmlDictionaryWriter writer,
SamlSerializer samlSerializer,
SecurityTokenSerializer keyInfoTokenSerializer)
SecurityTokenSerializer keyInfoSerializer)
{
if (writer == null)
throw new ArgumentNullException ("writer");
@ -211,11 +211,11 @@ namespace System.IdentityModel.Tokens
try {
if (Conditions != null)
Conditions.WriteXml (writer, samlSerializer, keyInfoTokenSerializer);
Conditions.WriteXml (writer, samlSerializer, keyInfoSerializer);
if (Advice != null)
Advice.WriteXml (writer, samlSerializer, keyInfoTokenSerializer);
Advice.WriteXml (writer, samlSerializer, keyInfoSerializer);
foreach (SamlStatement statement in Statements)
statement.WriteXml (writer, samlSerializer, keyInfoTokenSerializer);
statement.WriteXml (writer, samlSerializer, keyInfoSerializer);
} catch (NotImplementedException) {
throw;
} catch (Exception ex) { // bad catch, eh?
@ -226,7 +226,7 @@ namespace System.IdentityModel.Tokens
[MonoTODO]
protected void ReadSignature (XmlDictionaryReader reader,
SecurityTokenSerializer keyInfoTokenSerializer,
SecurityTokenSerializer keyInfoSerializer,
SecurityTokenResolver outOfBandTokenResolver,
SamlSerializer samlSerializer)
{