Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs

@@ -61,17 +61,17 @@ namespace System.ServiceModel.Security.Tokens
 			binding = issuerBinding;
 		}
 
-		protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters source)
-			: base (source)
+		protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters other)
+			: base (other)
 		{
-			binding = source.binding;
-			issuer_address = source.issuer_address;
-			issuer_meta_address = source.issuer_meta_address;
-			key_size = source.key_size;
-			key_type = source.key_type;
-			token_type = source.token_type;
-			reqs = new Collection<ClaimTypeRequirement> (source.reqs);
-			additional_reqs = new Collection<XmlElement> (source.additional_reqs);
+			binding = other.binding;
+			issuer_address = other.issuer_address;
+			issuer_meta_address = other.issuer_meta_address;
+			key_size = other.key_size;
+			key_type = other.key_type;
+			token_type = other.token_type;
+			reqs = new Collection<ClaimTypeRequirement> (other.reqs);
+			additional_reqs = new Collection<XmlElement> (other.additional_reqs);
 		}
 
 		Binding binding;

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs

@@ -37,8 +37,8 @@ namespace System.ServiceModel.Security.Tokens
 		{
 		}
 
-		protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters source)
-			: base (source)
+		protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs

@@ -39,8 +39,8 @@ namespace System.ServiceModel.Security.Tokens
 			RequireDerivedKeys = true;
 		}
 
-		protected RsaSecurityTokenParameters (RsaSecurityTokenParameters source)
-			: base (source)
+		protected RsaSecurityTokenParameters (RsaSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs

@@ -111,11 +111,11 @@ namespace System.ServiceModel.Security.Tokens
 		}
 #endif
 
-		protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters source)
-			: base (source)
+		protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters other)
+			: base (other)
 		{
-			this.element = (SecurityBindingElement) source.element.Clone ();
-			this.cancellable = source.cancellable;
+			this.element = (SecurityBindingElement) other.element.Clone ();
+			this.cancellable = other.cancellable;
 #if !MOBILE && !XAMMAC_4_5
 			this.requirements = new ChannelProtectionRequirements (default_channel_protection_requirements);
 #endif

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs

@@ -200,10 +200,10 @@ namespace System.ServiceModel.Security.Tokens
 			throw new NotSupportedException (String.Format ("X509SecurityToken does not support creation of {0}.", t));
 		}
 
-		public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause clause)
+		public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause keyIdentifierClause)
 		{
 			SecurityContextKeyIdentifierClause sctic =
-				clause as SecurityContextKeyIdentifierClause;
+				keyIdentifierClause as SecurityContextKeyIdentifierClause;
 			return sctic != null && sctic.ContextId == ContextId &&
 			       sctic.Generation == KeyGeneration;
 		}

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs

@@ -52,11 +52,11 @@ namespace System.ServiceModel.Security.Tokens
 			this.cancel = requireCancellation;
 		}
 
-		protected SslSecurityTokenParameters (SslSecurityTokenParameters source)
-			: base (source)
+		protected SslSecurityTokenParameters (SslSecurityTokenParameters other)
+			: base (other)
 		{
-			cert = source.cert;
-			cancel = source.cancel;
+			cert = other.cert;
+			cancel = other.cancel;
 		}
 
 		bool cert, cancel;

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs

@@ -44,7 +44,7 @@ namespace System.ServiceModel.Security.Tokens
 		bool extract_groups, allow_unauth;
 
 		[MonoTODO]
-		public SspiSecurityToken (NetworkCredential cred,
+		public SspiSecurityToken (NetworkCredential networkCredential,
 			bool extractGroupsForWindowsAccounts,
 			bool allowUnauthenticatedCallers)
 		{
@@ -54,7 +54,7 @@ namespace System.ServiceModel.Security.Tokens
 		[MonoTODO]
 		public SspiSecurityToken (
 			TokenImpersonationLevel impersonationLevel,
-			bool allowNtlm, NetworkCredential cred)
+			bool allowNtlm, NetworkCredential networkCredential)
 		{
 			throw new NotImplementedException ();
 		}

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs

@@ -47,10 +47,10 @@ namespace System.ServiceModel.Security.Tokens
 			this.cancel = requireCancellation;
 		}
 
-		protected SspiSecurityTokenParameters (SspiSecurityTokenParameters source)
-			: base (source)
+		protected SspiSecurityTokenParameters (SspiSecurityTokenParameters other)
+			: base (other)
 		{
-			this.cancel = source.cancel;
+			this.cancel = other.cancel;
 		}
 
 		public bool RequireCancellation {

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs

@@ -40,8 +40,8 @@ namespace System.ServiceModel.Security.Tokens
 			RequireDerivedKeys = false;
 		}
 
-		protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters source)
-			: base (source)
+		protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 

mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs

@@ -51,10 +51,10 @@ namespace System.ServiceModel.Security.Tokens
 			InclusionMode = inclusionMode;
 		}
 
-		protected X509SecurityTokenParameters (X509SecurityTokenParameters source)
-			: base (source)
+		protected X509SecurityTokenParameters (X509SecurityTokenParameters other)
+			: base (other)
 		{
-			reference_style = source.reference_style;
+			reference_style = other.reference_style;
 		}
 
 		public X509KeyIdentifierClauseType X509ReferenceStyle {