diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-16 06:20:59 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-16 15:02:09 +0300 |
commit | 882d805b9d5b3fe2215e1fd968e5d72d55c0a78e (patch) | |
tree | 98a19432988b028e5e5f05024c758bab00f5eb02 /mcs/class/System.IdentityModel | |
parent | 8632f59dd2bcf3c393585f6420406350bf896326 (diff) |
[System.IdentityModel] Rename method parameters to match .NET contract
Diffstat (limited to 'mcs/class/System.IdentityModel')
51 files changed, 190 insertions, 190 deletions
diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs index 17df9c02d6d..5a214aba0d0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/Claim.cs @@ -78,7 +78,7 @@ namespace System.IdentityModel.Claims } [MonoTODO] - public static Claim CreateDenyOnlyWindowsSidClaim (SecurityIdentifier identifier) + public static Claim CreateDenyOnlyWindowsSidClaim (SecurityIdentifier sid) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs index 35f2b509c3e..35bdf0a78fd 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/ClaimSet.cs @@ -71,7 +71,7 @@ namespace System.IdentityModel.Claims } public abstract IEnumerable<Claim> FindClaims ( - string resourceType, string right); + string claimType, string right); public abstract IEnumerator<Claim> GetEnumerator (); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs index 539c7a6dca7..b7370764ee6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Claims/WindowsClaimSet.cs @@ -41,25 +41,25 @@ namespace System.IdentityModel.Claims // Constructors [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity) + public WindowsClaimSet (WindowsIdentity windowsIdentity) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, bool includeWindowsGroups) + public WindowsClaimSet (WindowsIdentity windowsIdentity, bool includeWindowsGroups) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, DateTime expirationTime) + public WindowsClaimSet (WindowsIdentity windowsIdentity, DateTime expirationTime) { throw new NotImplementedException (); } [MonoTODO] - public WindowsClaimSet (WindowsIdentity identity, bool includeWindowsGroups, DateTime expirationTime) + public WindowsClaimSet (WindowsIdentity windowsIdentity, bool includeWindowsGroups, DateTime expirationTime) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs index b4479a72ff7..5b7287bf9cf 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/AuthorizationContext.cs @@ -39,15 +39,15 @@ namespace System.IdentityModel.Policy { [MonoTODO] public static AuthorizationContext - CreateDefaultAuthorizationContext (IList<IAuthorizationPolicy> policies) + CreateDefaultAuthorizationContext (IList<IAuthorizationPolicy> authorizationPolicies) { - if (policies == null) - throw new ArgumentNullException ("policies"); + if (authorizationPolicies == null) + throw new ArgumentNullException ("authorizationPolicies"); string id = new UniqueId ().ToString (); DefaultEvaluationContext ctx = new DefaultEvaluationContext (); - foreach (IAuthorizationPolicy a in policies) { + foreach (IAuthorizationPolicy a in authorizationPolicies) { object o = null; a.Evaluate (ctx, ref o); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs index 9f4e82b7e78..7fde4e6659d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Policy/EvaluationContext.cs @@ -46,10 +46,10 @@ namespace System.IdentityModel.Policy public abstract ReadOnlyCollection<ClaimSet> ClaimSets { get; } public abstract void AddClaimSet ( - IAuthorizationPolicy authorizationPolicy, + IAuthorizationPolicy policy, ClaimSet claimSet); - public abstract void RecordExpirationTime (DateTime time); + public abstract void RecordExpirationTime (DateTime expirationTime); } // default implementation diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs index 62d7d56782b..644fda786ca 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/KerberosSecurityTokenProvider.cs @@ -46,11 +46,11 @@ namespace System.IdentityModel.Selectors } [MonoTODO] - public KerberosSecurityTokenProvider (string servicePrincipalName, TokenImpersonationLevel tokenImpersonationLevel, NetworkCredential credential) + public KerberosSecurityTokenProvider (string servicePrincipalName, TokenImpersonationLevel tokenImpersonationLevel, NetworkCredential networkCredential) { name = servicePrincipalName; impersonation_level = tokenImpersonationLevel; - this.credential = credential; + this.credential = networkCredential; } string name; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs index 7381e691500..b78eea054be 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenManager.cs @@ -41,11 +41,11 @@ namespace System.IdentityModel.Selectors public abstract SecurityTokenAuthenticator CreateSecurityTokenAuthenticator ( - SecurityTokenRequirement requirement, - out SecurityTokenResolver resolver); + SecurityTokenRequirement tokenRequirement, + out SecurityTokenResolver outOfBandTokenResolver); public abstract SecurityTokenProvider - CreateSecurityTokenProvider(SecurityTokenRequirement requirement); + CreateSecurityTokenProvider(SecurityTokenRequirement tokenRequirement); public abstract SecurityTokenSerializer CreateSecurityTokenSerializer (SecurityTokenVersion version); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs index 386e285bd77..9bc5a1ec5f6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenProvider.cs @@ -77,16 +77,16 @@ namespace System.IdentityModel.Selectors EndCancelTokenCore (result); } - public SecurityToken RenewToken (TimeSpan timeout, SecurityToken token) + public SecurityToken RenewToken (TimeSpan timeout, SecurityToken tokenToBeRenewed) { - return RenewTokenCore (timeout, token); + return RenewTokenCore (timeout, tokenToBeRenewed); } public IAsyncResult BeginRenewToken ( - TimeSpan timeout, SecurityToken token, + TimeSpan timeout, SecurityToken tokenToBeRenewed, AsyncCallback callback, object state) { - return BeginRenewTokenCore (timeout, token, callback, state); + return BeginRenewTokenCore (timeout, tokenToBeRenewed, callback, state); } public SecurityToken EndRenewToken (IAsyncResult result) @@ -101,7 +101,7 @@ namespace System.IdentityModel.Selectors throw new NotSupportedException (String.Format ("Token cancellation on this security token provider '{0}' is not supported.", this)); } - protected virtual SecurityToken RenewTokenCore (TimeSpan timeout, SecurityToken token) + protected virtual SecurityToken RenewTokenCore (TimeSpan timeout, SecurityToken tokenToBeRenewed) { throw new NotSupportedException (String.Format ("Token renewal on this security token provider '{0}' is not supported.", this)); } @@ -124,7 +124,7 @@ namespace System.IdentityModel.Selectors protected virtual IAsyncResult BeginRenewTokenCore ( TimeSpan timeout, - SecurityToken token, + SecurityToken tokenToBeRenewed, AsyncCallback callback, object state) { throw new NotSupportedException (String.Format ("Token renewal on this security token provider '{0}' is not supported.", this)); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs index c75e373ab19..bff51cdf302 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Selectors/SecurityTokenRequirement.cs @@ -125,28 +125,28 @@ namespace System.IdentityModel.Selectors } } - public TValue GetProperty<TValue> (string property) + public TValue GetProperty<TValue> (string propertyName) { TValue ret; - if (TryGetProperty<TValue> (property, out ret)) + if (TryGetProperty<TValue> (propertyName, out ret)) return ret; - throw new ArgumentException (String.Format ("Property '{0}' was not found.", property)); + throw new ArgumentException (String.Format ("Property '{0}' was not found.", propertyName)); } - public bool TryGetProperty<TValue> (string property, out TValue value) + public bool TryGetProperty<TValue> (string propertyName, out TValue result) { object tmp; - value = default (TValue); + result = default (TValue); - if (!Properties.TryGetValue (property, out tmp)) + if (!Properties.TryGetValue (propertyName, out tmp)) return false; if (tmp == null && !typeof (TValue).IsValueType) - value = default (TValue); + result = default (TValue); else if (tmp is TValue) - value = (TValue) tmp; + result = (TValue) tmp; else - throw new ArgumentException (String.Format ("The value of property '{0}' is of type '{1}', while '{2}' is expected.", property, tmp.GetType (), typeof (TValue))); - return value != null; + throw new ArgumentException (String.Format ("The value of property '{0}' is of type '{1}', while '{2}' is expected.", propertyName, tmp.GetType (), typeof (TValue))); + return result != null; } } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs index e82c35c1f62..808479b45e1 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BinaryKeyIdentifierClause.cs @@ -54,10 +54,10 @@ namespace System.IdentityModel.Tokens return (byte []) GetRawBuffer ().Clone (); } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { BinaryKeyIdentifierClause other = - clause as BinaryKeyIdentifierClause; + keyIdentifierClause as BinaryKeyIdentifierClause; if (other == null) return false; return Matches (other.GetRawBuffer ()); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs index d835a6acc8e..6b7625c16a5 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/BootstrapContext.cs @@ -1,4 +1,4 @@ -// +// // BootstrapContext.cs // // Author: @@ -60,14 +60,14 @@ namespace System.IdentityModel.Tokens { } /// <summary>Initializes a new instance of the <see cref="BootstrapContext"/> class by using the specified security token and token handler.</summary> - public BootstrapContext (SecurityToken token, SecurityTokenHandler handler) + public BootstrapContext (SecurityToken token, SecurityTokenHandler tokenHandler) { if (token == null) throw new ArgumentNullException ("token"); - if (handler == null) - throw new ArgumentNullException ("handler"); + if (tokenHandler == null) + throw new ArgumentNullException ("tokenHandler"); SecurityToken = token; - SecurityTokenHandler = handler; + SecurityTokenHandler = tokenHandler; } /// <summary>Initializes a new instance of the <see cref="BootstrapContext"/> class from a stream.</summary> diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs index 102a45afaf3..ea9b1c079e8 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/EncryptedKeyIdentifierClause.cs @@ -42,26 +42,26 @@ namespace System.IdentityModel.Tokens public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier) - : this (encryptedKey, encryptionMethod, identifier, null) + SecurityKeyIdentifier encryptingKeyIdentifier) + : this (encryptedKey, encryptionMethod, encryptingKeyIdentifier, null) { } public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier, string carriedKeyName) - : this (encryptedKey, encryptionMethod, identifier, carriedKeyName, null, 0) + SecurityKeyIdentifier encryptingKeyIdentifier, string carriedKeyName) + : this (encryptedKey, encryptionMethod, encryptingKeyIdentifier, carriedKeyName, null, 0) { } public EncryptedKeyIdentifierClause ( byte [] encryptedKey, string encryptionMethod, - SecurityKeyIdentifier identifier, string carriedKeyName, + SecurityKeyIdentifier encryptingKeyIdentifier, string carriedKeyName, byte [] derivationNonce, int derivationLength) : base (encryptionMethod, encryptedKey, true, derivationNonce, derivationLength) { this.carried_key_name = carriedKeyName; - this.identifier = identifier; + this.identifier = encryptingKeyIdentifier; this.enc_method = encryptionMethod; } @@ -100,10 +100,10 @@ namespace System.IdentityModel.Tokens return true; } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { EncryptedKeyIdentifierClause e = - clause as EncryptedKeyIdentifierClause; + keyIdentifierClause as EncryptedKeyIdentifierClause; return e != null && Matches (e.GetRawBuffer (), e.EncryptionMethod, e.CarriedKeyName); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs index e503a358869..8b845d14b0a 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/GenericXmlSecurityToken.cs @@ -111,7 +111,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs index b6a0f8c329c..014d8a70f7f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/InMemorySymmetricSecurityKey.cs @@ -42,16 +42,16 @@ namespace System.IdentityModel.Tokens { byte [] key; - public InMemorySymmetricSecurityKey (byte [] key) - : this (key, true) + public InMemorySymmetricSecurityKey (byte [] symmetricKey) + : this (symmetricKey, true) { } - public InMemorySymmetricSecurityKey (byte [] key, bool clone) + public InMemorySymmetricSecurityKey (byte [] symmetricKey, bool cloneBuffer) { - if (key == null) - throw new ArgumentNullException ("key"); - this.key = clone ? (byte []) key.Clone() : key; + if (symmetricKey == null) + throw new ArgumentNullException ("symmetricKey"); + this.key = cloneBuffer ? (byte []) symmetricKey.Clone() : symmetricKey; } // SymmetricSecurityKey implementation diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs index 9d6badcb5f1..610efd0d48d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosReceiverSecurityToken.cs @@ -72,7 +72,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs index 3de266be9ec..aabede60c0e 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/KerberosRequestorSecurityToken.cs @@ -98,7 +98,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs index 82dbb01c4f2..c58bc50c99b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/LocalIdKeyIdentifierClause.cs @@ -62,12 +62,12 @@ namespace System.IdentityModel.Tokens get { return owner_type; } } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { - if (clause == null) - throw new ArgumentNullException ("clause"); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); LocalIdKeyIdentifierClause c = - clause as LocalIdKeyIdentifierClause; + keyIdentifierClause as LocalIdKeyIdentifierClause; return c != null && Matches (c.LocalId, c.OwnerType); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs index a06b6a38fa1..a448130eef3 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaKeyIdentifierClause.cs @@ -78,12 +78,12 @@ namespace System.IdentityModel.Tokens throw new NotImplementedException (); } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { - if (clause == null) - throw new ArgumentNullException ("clause"); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); RsaKeyIdentifierClause rkic = - clause as RsaKeyIdentifierClause; + keyIdentifierClause as RsaKeyIdentifierClause; return rkic != null && Matches (rkic.Rsa); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs index b1cc2bf2ee3..2f5031ea72c 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityKey.cs @@ -46,7 +46,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override AsymmetricAlgorithm GetAsymmetricAlgorithm ( - string algorithm, bool privateKey) + string algorithm, bool requiresPrivateKey) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs index c44bc1dc998..b3fd1fafd0c 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/RsaSecurityToken.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs index 7deb1041222..8f07e506e32 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAction.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -104,7 +104,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs index 306de28a908..b4b295a6875 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAdvice.cs @@ -89,7 +89,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -105,7 +105,7 @@ namespace System.IdentityModel.Tokens switch (reader.LocalName) { case "Assertion": SamlAssertion a = new SamlAssertion (); - a.ReadXml (reader, samlSerializer, keyInfoTokenSerializer, outOfBandTokenResolver); + a.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); assertions.Add (a); break; case "AssertionIDReference": @@ -120,7 +120,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -130,7 +130,7 @@ namespace System.IdentityModel.Tokens foreach (string idref in AssertionIdReferences) writer.WriteElementString ("saml", "AssertionIDReference", SamlConstants.Namespace, idref); foreach (SamlAssertion assertion in Assertions) - assertion.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + assertion.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs index 65715ee56b9..43d54cc3f6b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertion.cs @@ -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) { diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs index 61bf8b4de85..33d76628e4b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAssertionKeyIdentifierClause.cs @@ -49,7 +49,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs index 92605125f51..f1e54538329 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttribute.cs @@ -114,7 +114,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -122,7 +122,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { writer.WriteStartElement ("saml", "Attribute", SamlConstants.Namespace); writer.WriteAttributeString ("AttributeName", Name); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs index abd6206926f..0ef757e5d4d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAttributeStatement.cs @@ -66,7 +66,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -74,14 +74,14 @@ namespace System.IdentityModel.Tokens public override void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (SamlSubject == null) throw new SecurityTokenException ("Subject is null in the AttributeStatement"); writer.WriteStartElement ("saml", "AttributeStatement", SamlConstants.Namespace); - SamlSubject.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + SamlSubject.WriteXml (writer, samlSerializer, keyInfoSerializer); foreach (SamlAttribute a in Attributes) - a.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + a.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs index 4dd369238f8..13e07b66be8 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthenticationStatement.cs @@ -124,7 +124,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -132,7 +132,7 @@ namespace System.IdentityModel.Tokens public override void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -145,7 +145,7 @@ namespace System.IdentityModel.Tokens writer.WriteAttributeString ("AuthenticationMethod", AuthenticationMethod); writer.WriteAttributeString ("AuthenticationInstant", AuthenticationInstant.ToString (SamlConstants.DateFormat, CultureInfo.InvariantCulture)); - SamlSubject.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + SamlSubject.WriteXml (writer, samlSerializer, keyInfoSerializer); if (DnsAddress != null || IPAddress != null) { writer.WriteStartElement ("saml", "SubjectLocality", SamlConstants.Namespace); if (IPAddress != null) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs index 8949c160ee1..e9d8d77507d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorityBinding.cs @@ -46,11 +46,11 @@ namespace System.IdentityModel.Tokens { } - public SamlAuthorityBinding (XmlQualifiedName kind, string binding, string location) + public SamlAuthorityBinding (XmlQualifiedName authorityKind, string binding, string location) { - if (kind == null) - throw new ArgumentNullException ("kind"); - AuthorityKind = kind; + if (authorityKind == null) + throw new ArgumentNullException ("authorityKind"); + AuthorityKind = authorityKind; Binding = binding; Location = location; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs index bcfbcba8f0b..16dfcce1d62 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionClaimResource.cs @@ -39,10 +39,10 @@ namespace System.IdentityModel.Tokens public class SamlAuthorizationDecisionClaimResource { public SamlAuthorizationDecisionClaimResource ( - string resource, SamlAccessDecision decision, string actionNamespace, string actionName) + string resource, SamlAccessDecision accessDecision, string actionNamespace, string actionName) { this.resource = resource; - this.decision = decision; + this.decision = accessDecision; this.name = actionName; this.ns = actionNamespace; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs index 816c2369fbd..a3cd23bbb9b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlAuthorizationDecisionStatement.cs @@ -132,7 +132,7 @@ namespace System.IdentityModel.Tokens public override void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, SecurityTokenSerializer keyInfoSerializer, - SecurityTokenResolver resolver) + SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) throw new ArgumentNullException ("reader"); @@ -159,20 +159,20 @@ namespace System.IdentityModel.Tokens reader.MoveToContent (); SamlSubject = new SamlSubject (); - SamlSubject.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + SamlSubject.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); SamlActions.Clear (); for (reader.MoveToContent (); reader.LocalName == "Action" && reader.NamespaceURI == SamlConstants.Namespace; reader.MoveToContent ()) { SamlAction action = new SamlAction (); - action.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + action.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); SamlActions.Add (action); } if (reader.LocalName == "Evidence" && reader.NamespaceURI == SamlConstants.Namespace) { Evidence = new SamlEvidence (); - Evidence.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + Evidence.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); reader.MoveToContent (); } reader.ReadEndElement (); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs index e4e95684482..d72e789b310 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlConditions.cs @@ -102,7 +102,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); @@ -110,7 +110,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); @@ -123,7 +123,7 @@ namespace System.IdentityModel.Tokens if (has_not_on_after) writer.WriteAttributeString ("NotOnOrAfter", NotOnOrAfter.ToString (SamlConstants.DateFormat, invariant)); foreach (SamlCondition cond in Conditions) - cond.WriteXml (writer, samlSerializer, keyInfoTokenSerializer); + cond.WriteXml (writer, samlSerializer, keyInfoSerializer); writer.WriteEndElement (); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs index 65469029179..dd66972c502 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlEvidence.cs @@ -100,7 +100,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, SecurityTokenSerializer keyInfoSerializer, - SecurityTokenResolver resolver) + SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) throw new ArgumentNullException ("reader"); @@ -118,7 +118,7 @@ namespace System.IdentityModel.Tokens switch (reader.LocalName) { case "Assertion": SamlAssertion a = new SamlAssertion (); - a.ReadXml (reader, samlSerializer, keyInfoSerializer, resolver); + a.ReadXml (reader, samlSerializer, keyInfoSerializer, outOfBandTokenResolver); assertions.Add (a); break; case "AssertionIDReference": diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs index c2d1538d1d0..7f58a9f2a6a 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSecurityToken.cs @@ -87,7 +87,7 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs index 85c1ea1c619..03ff28b46a6 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSerializer.cs @@ -43,56 +43,56 @@ namespace System.IdentityModel.Tokens [MonoTODO] public virtual SamlAdvice LoadAdvice (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlAssertion LoadAssertion (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlAttribute LoadAttribute (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlCondition LoadCondition (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlConditions LoadConditions (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlStatement LoadStatement (XmlDictionaryReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } [MonoTODO] public virtual SamlSecurityToken ReadToken (XmlReader reader, - SecurityTokenSerializer tokenSerializer, - SecurityTokenResolver tokenResolver) + SecurityTokenSerializer keyInfoSerializer, + SecurityTokenResolver outOfBandTokenResolver) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs index 4feb41544bf..4917cf161f5 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlStatement.cs @@ -49,11 +49,11 @@ namespace System.IdentityModel.Tokens public abstract void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver); public abstract void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer); + SecurityTokenSerializer keyInfoSerializer); } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs index 975f9727e19..c456500a118 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SamlSubject.cs @@ -153,7 +153,7 @@ namespace System.IdentityModel.Tokens public virtual void ReadXml (XmlDictionaryReader reader, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer, + SecurityTokenSerializer keyInfoSerializer, SecurityTokenResolver outOfBandTokenResolver) { if (reader == null) @@ -173,7 +173,7 @@ namespace System.IdentityModel.Tokens public virtual void WriteXml (XmlDictionaryWriter writer, SamlSerializer samlSerializer, - SecurityTokenSerializer keyInfoTokenSerializer) + SecurityTokenSerializer keyInfoSerializer) { if (writer == null) throw new ArgumentNullException ("writer"); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs index 302fe39cf05..bf35190026f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifier.cs @@ -42,9 +42,9 @@ namespace System.IdentityModel.Tokens this.list = new List<SecurityKeyIdentifierClause> (); } - public SecurityKeyIdentifier (params SecurityKeyIdentifierClause [] identifiers) + public SecurityKeyIdentifier (params SecurityKeyIdentifierClause [] clauses) { - this.list = new List<SecurityKeyIdentifierClause> (identifiers); + this.list = new List<SecurityKeyIdentifierClause> (clauses); } List<SecurityKeyIdentifierClause> list; @@ -67,15 +67,15 @@ namespace System.IdentityModel.Tokens get { return is_readonly; } } - public SecurityKeyIdentifierClause this [int i] { - get { return list [i]; } + public SecurityKeyIdentifierClause this [int index] { + get { return list [index]; } } - public void Add (SecurityKeyIdentifierClause item) + public void Add (SecurityKeyIdentifierClause clause) { if (is_readonly) throw new InvalidOperationException ("This SecurityKeyIdentifier is read-only."); - list.Add (item); + list.Add (clause); } public SecurityKey CreateKey () @@ -121,13 +121,13 @@ namespace System.IdentityModel.Tokens return sb.ToString (); } - public bool TryFind<TClause> (out TClause result) + public bool TryFind<TClause> (out TClause clause) where TClause : SecurityKeyIdentifierClause { - result = default (TClause); + clause = default (TClause); foreach (SecurityKeyIdentifierClause kic in this) if (typeof (TClause).IsAssignableFrom (kic.GetType ())) { - result = (TClause) kic; + clause = (TClause) kic; return true; } return false; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs index 1dba4954631..d464e524bcc 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityKeyIdentifierClause.cs @@ -39,12 +39,12 @@ namespace System.IdentityModel.Tokens this.clause_type = clauseType; } - protected SecurityKeyIdentifierClause (string clauseType, byte [] derivationNonce, int derivationLength) + protected SecurityKeyIdentifierClause (string clauseType, byte [] nonce, int length) { this.clause_type = clauseType; - if (derivationNonce != null) - this.nonce = (byte []) derivationNonce.Clone (); - this.deriv_length = derivationLength; + if (nonce != null) + this.nonce = (byte []) nonce.Clone (); + this.deriv_length = length; } string clause_type; @@ -76,7 +76,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public virtual bool Matches (SecurityKeyIdentifierClause clause) + public virtual bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs index 23a636626f8..335808fc560 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityToken.cs @@ -63,24 +63,24 @@ namespace System.IdentityModel.Tokens } public virtual bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { return false; } [MonoTODO] public virtual SecurityKey ResolveKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { - if (skiClause == null) - throw new ArgumentNullException ("skiClause"); - if (!MatchesKeyIdentifierClause (skiClause)) - throw new InvalidOperationException (String.Format ("This '{0}' security token does not support resolving '{1}' key identifier clause.", GetType (), skiClause)); - if (skiClause.CanCreateKey) - return skiClause.CreateKey (); + if (keyIdentifierClause == null) + throw new ArgumentNullException ("keyIdentifierClause"); + if (!MatchesKeyIdentifierClause (keyIdentifierClause)) + throw new InvalidOperationException (String.Format ("This '{0}' security token does not support resolving '{1}' key identifier clause.", GetType (), keyIdentifierClause)); + if (keyIdentifierClause.CanCreateKey) + return keyIdentifierClause.CreateKey (); // FIXME: examine it. if (SecurityKeys.Count == 0) - throw new InvalidOperationException (String.Format ("This '{0}' security token does not have any keys that can be resolved.", GetType (), skiClause)); + throw new InvalidOperationException (String.Format ("This '{0}' security token does not have any keys that can be resolved.", GetType (), keyIdentifierClause)); return SecurityKeys [0]; } } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs index bdd6eb50e03..9ce9eb87b33 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenException.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class SecurityTokenException : SystemException { public SecurityTokenException () : base () {} - public SecurityTokenException (string msg) : base (msg) {} - public SecurityTokenException (string msg, Exception inner) : base (msg, inner) {} + public SecurityTokenException (string message) : base (message) {} + public SecurityTokenException (string message, Exception innerException) : base (message, innerException) {} protected SecurityTokenException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs index c5301cd6f8e..9aaf39d51a0 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenExpiredException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenExpiredException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenExpiredException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenExpiredException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenExpiredException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs index 4f9e5f18f6c..4f4b76d676e 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenNotYetValidException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenNotYetValidException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenNotYetValidException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenNotYetValidException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenNotYetValidException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs index e04d0cbd28e..b0113defd8b 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenReplayDetectedException.cs @@ -1,4 +1,4 @@ -// +// // SecurityTokenReplayDetectedException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel.Tokens : base(message) { } - public SecurityTokenReplayDetectedException(string message, Exception innerException) - : base(message, innerException) + public SecurityTokenReplayDetectedException(string message, Exception inner) + : base(message, inner) { } public SecurityTokenReplayDetectedException(SerializationInfo info, StreamingContext context) diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs index 72189b8b97d..e9c5bc879b4 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/SecurityTokenValidationException.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class SecurityTokenValidationException : SecurityTokenException { public SecurityTokenValidationException () : base () {} - public SecurityTokenValidationException (string msg) : base (msg) {} - public SecurityTokenValidationException (string msg, Exception inner) : base (msg, inner) {} + public SecurityTokenValidationException (string message) : base (message) {} + public SecurityTokenValidationException (string message, Exception innerException) : base (message, innerException) {} protected SecurityTokenValidationException (SerializationInfo info, StreamingContext context) : base (info, context) {} } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs index 66c68c0030b..1a37602138d 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/WindowsSecurityToken.cs @@ -42,14 +42,14 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public WindowsSecurityToken (WindowsIdentity identity) + public WindowsSecurityToken (WindowsIdentity windowsIdentity) { throw new NotImplementedException (); } - public WindowsSecurityToken (WindowsIdentity identity, string id) + public WindowsSecurityToken (WindowsIdentity windowsIdentity, string id) { - this.identity = identity; + this.identity = windowsIdentity; this.id = id; } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs index f95ec9bb5d4..3dc838424de 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509IssuerSerialKeyIdentifierClause.cs @@ -99,10 +99,10 @@ namespace System.IdentityModel.Tokens get { return serial; } } - public override bool Matches (SecurityKeyIdentifierClause clause) + public override bool Matches (SecurityKeyIdentifierClause keyIdentifierClause) { X509IssuerSerialKeyIdentifierClause other = - clause as X509IssuerSerialKeyIdentifierClause; + keyIdentifierClause as X509IssuerSerialKeyIdentifierClause; return other != null && Matches (other.name, other.serial); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs index fe3751b96a6..ea545764c01 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SecurityToken.cs @@ -111,27 +111,27 @@ namespace System.IdentityModel.Tokens [MonoTODO] public override bool MatchesKeyIdentifierClause ( - SecurityKeyIdentifierClause skiClause) + SecurityKeyIdentifierClause keyIdentifierClause) { LocalIdKeyIdentifierClause l = - skiClause as LocalIdKeyIdentifierClause; + keyIdentifierClause as LocalIdKeyIdentifierClause; if (l != null) return l.LocalId == Id; X509ThumbprintKeyIdentifierClause t = - skiClause as X509ThumbprintKeyIdentifierClause; + keyIdentifierClause as X509ThumbprintKeyIdentifierClause; if (t != null) return t.Matches (cert); X509IssuerSerialKeyIdentifierClause i = - skiClause as X509IssuerSerialKeyIdentifierClause; + keyIdentifierClause as X509IssuerSerialKeyIdentifierClause; if (i != null) return i.Matches (cert); X509SubjectKeyIdentifierClause s = - skiClause as X509SubjectKeyIdentifierClause; + keyIdentifierClause as X509SubjectKeyIdentifierClause; if (s != null) return s.Matches (cert); X509RawDataKeyIdentifierClause r = - skiClause as X509RawDataKeyIdentifierClause; + keyIdentifierClause as X509RawDataKeyIdentifierClause; if (r != null) return r.Matches (cert); diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs index 9780e8b9e1f..b1f7adffe6f 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509SubjectKeyIdentifierClause.cs @@ -35,8 +35,8 @@ namespace System.IdentityModel.Tokens public class X509SubjectKeyIdentifierClause : BinaryKeyIdentifierClause { [MonoTODO] - public X509SubjectKeyIdentifierClause (byte [] certificateSubject) - : base (null, certificateSubject, true) + public X509SubjectKeyIdentifierClause (byte [] ski) + : base (null, ski, true) { throw new NotImplementedException (); } @@ -66,7 +66,7 @@ namespace System.IdentityModel.Tokens } [MonoTODO] - public static bool TryCreateFrom (X509Certificate2 certificate, out X509SubjectKeyIdentifierClause clause) + public static bool TryCreateFrom (X509Certificate2 certificate, out X509SubjectKeyIdentifierClause keyIdentifierClause) { throw new NotImplementedException (); } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs index 4b8cdda2edf..0ae177e7d79 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509ThumbprintKeyIdentifierClause.cs @@ -34,8 +34,8 @@ namespace System.IdentityModel.Tokens { public class X509ThumbprintKeyIdentifierClause : BinaryKeyIdentifierClause { - public X509ThumbprintKeyIdentifierClause (byte [] certificateThumbprint) - : base (null, certificateThumbprint, true) + public X509ThumbprintKeyIdentifierClause (byte [] thumbprint) + : base (null, thumbprint, true) { } diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs index c2c77269bcb..fe0c7b52d50 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel.Tokens/X509WindowsSecurityToken.cs @@ -37,16 +37,16 @@ namespace System.IdentityModel.Tokens public class X509WindowsSecurityToken : X509SecurityToken { [MonoTODO] - public X509WindowsSecurityToken (X509Certificate2 cert, WindowsIdentity identity) - : base (cert) + public X509WindowsSecurityToken (X509Certificate2 certificate, WindowsIdentity windowsIdentity) + : base (certificate) { throw new NotImplementedException (); } - public X509WindowsSecurityToken (X509Certificate2 cert, WindowsIdentity identity, string id) - : base (cert, id) + public X509WindowsSecurityToken (X509Certificate2 certificate, WindowsIdentity windowsIdentity, string id) + : base (certificate, id) { - this.identity = identity; + this.identity = windowsIdentity; } WindowsIdentity identity; diff --git a/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs b/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs index 0a1f0ceb480..6ce46ff3afd 100644 --- a/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs +++ b/mcs/class/System.IdentityModel/System.IdentityModel/SignatureVerificationFailedException.cs @@ -1,4 +1,4 @@ -// +// // SignatureVerificationFailedException.cs // // Author: @@ -41,8 +41,8 @@ namespace System.IdentityModel : base(message) { } - public SignatureVerificationFailedException(string message, Exception innerException) - : base(message, innerException) + public SignatureVerificationFailedException(string message, Exception inner) + : base(message, inner) { } public SignatureVerificationFailedException(SerializationInfo info, StreamingContext context) |