Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

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;

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);

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));

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;
 		}
 	}
 }