Fix some compiler warnings in Mono.Security and System.

10 files changed, 11 insertions, 48 deletions

diff --git a/mcs/class/Mono.Security/Makefile b/mcs/class/Mono.Security/Makefile
index f9508b9c8a6..d15fb96bc24 100644
--- a/mcs/class/Mono.Security/Makefile
+++ b/mcs/class/Mono.Security/Makefile
@@ -5,7 +5,7 @@ include ../../build/rules.make
 LIBRARY = Mono.Security.dll
 LOCAL_MCS_FLAGS = -lib:$(the_libdir_base)bare
 LIB_REFS = System
-LIB_MCS_FLAGS = -unsafe -nowarn:1030
+LIB_MCS_FLAGS = -unsafe -nowarn:1030,3009
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,618,672
 
 include ../../build/library.make
diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs b/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs
index a02a3f9316a..d7eb2291f6d 100644
--- a/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs
@@ -52,12 +52,11 @@ namespace Mono.Security.Interface
 			this.policy_errors = policy_errors;
 		}
 
-		internal ValidationResult (bool trusted, bool user_defined, int error_code)
+		internal ValidationResult (bool trusted, bool user_denied, int error_code)
 		{
 			this.trusted = trusted;
 			this.user_denied = user_denied;
 			this.error_code = error_code;
-			this.policy_errors = policy_errors;
 		}
 
 		public bool Trusted {
diff --git a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
index afa21ff1deb..7e42720d17c 100644
--- a/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs
@@ -94,7 +94,7 @@ namespace Mono.Security.Interface
 		{
 		}
 
-		volatile static MonoTlsSettings defaultSettings;
+		static MonoTlsSettings defaultSettings;
 
 		public static MonoTlsSettings DefaultSettings {
 			get {
diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
index 0855f8d6dd7..7472e719400 100644
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs
@@ -89,7 +89,7 @@ namespace Mono.Security.Protocol.Ntlm {
 		public Type3Message (Type2Message type2) : base (3)
 		{
 			_type2 = type2;
-			_level = DefaultAuthLevel;
+			_level = NtlmSettings.DefaultAuthLevel;
 			_challenge = (byte[]) type2.Nonce.Clone ();
 
 			_domain = type2.TargetName;
@@ -269,11 +269,13 @@ namespace Mono.Security.Protocol.Ntlm {
 					throw new InvalidOperationException (
 						"Refusing to use legacy-mode LM/NTLM authentication " +
 							"unless explicitly enabled using DefaultAuthLevel.");
-				
+
+				#pragma warning disable 618
 				using (var legacy = new ChallengeResponse (_password, _challenge)) {
 					lm = legacy.LM;
 					ntlm = legacy.NT;
 				}
+				#pragma warning restore 618
 			} else {
 				ChallengeResponse2.Compute (_type2, _level, _username, _password, _domain, out lm, out ntlm);
 			}
diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs
index d59769b0a7e..f92ad900e84 100644
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs
@@ -131,6 +131,7 @@ namespace Mono.Security.Protocol.Tls.Handshake.Client
 
 		private X509Certificate FindParentCertificate (X509Certificate cert)
 		{
+			#pragma warning disable 618
 			// This certificate is the root certificate
 			if (cert.GetName () == cert.GetIssuerName ())
 				return null;
@@ -140,6 +141,7 @@ namespace Mono.Security.Protocol.Tls.Handshake.Client
 					return certificate;
 			}
 			return null;
+			#pragma warning restore 618
 		}
 
 		#endregion
diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
index e194013a637..30270c801c8 100644
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs
@@ -597,7 +597,7 @@ namespace Mono.Security.Protocol.Tls
 			try {
 				SendAlert(alert);
 			} catch (Exception alertEx) {
-				ex = new IOException (string.Format ("Error while sending TLS Alert ({0}:{1}): {2}", alert.Level, alert.Description, ex), ex);
+				ex = new IOException (string.Format ("Error while sending TLS Alert ({0}:{1}): {2}", alert.Level, alert.Description, ex), alertEx);
 			}
 		}
 
diff --git a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs
index b043f7e18cf..f8207297cb3 100644
--- a/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs
+++ b/mcs/class/Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs
@@ -132,7 +132,6 @@ namespace Mono.Security.Protocol.Tls
 					throw new TlsException(AlertDescription.UnexpectedMessage, String.Format(CultureInfo.CurrentUICulture,
 														 "Unknown server handshake message received ({0})", 
 														 type.ToString()));
-					break;
 			}
 			throw new TlsException (AlertDescription.HandshakeFailiure, String.Format ("Protocol error, unexpected protocol transition from {0} to {1}", last, type));
 		}
diff --git a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
index 1f37bc47589..224c4e3c315 100644
--- a/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
+++ b/mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs
@@ -85,37 +85,6 @@ namespace Mono.Net.Security
 		readonly MonoTlsStream tlsStream;
 		readonly HttpWebRequest request;
 
-		static bool is_macosx;
-		static bool is_mobile;
-#if !MOBILE
-		static X509RevocationMode revocation_mode;
-#endif
-
-		static ChainValidationHelper ()
-		{
-#if MONOTOUCH
-			is_macosx = true;
-			is_mobile = true;
-#elif MONODROID
-			is_macosx = false;
-			is_mobile = true;
-#else
-			is_macosx = System.IO.File.Exists (OSX509Certificates.SecurityLibrary);
-			is_mobile = false;
-#endif
-
-#if !MOBILE
-			revocation_mode = X509RevocationMode.NoCheck;
-			try {
-				string str = Environment.GetEnvironmentVariable ("MONO_X509_REVOCATION_MODE");
-				if (String.IsNullOrEmpty (str))
-					return;
-				revocation_mode = (X509RevocationMode)Enum.Parse (typeof(X509RevocationMode), str, true);
-			} catch {
-			}
-#endif
-		}
-
 		internal static ICertificateValidator GetDefaultValidator (MonoTlsProvider provider, MonoTlsSettings settings)
 		{
 			if (settings == null)
diff --git a/mcs/class/System/Mono.Net.Security/LegacySslStream.cs b/mcs/class/System/Mono.Net.Security/LegacySslStream.cs
index 4a7b792ea70..df560b7dd7a 100644
--- a/mcs/class/System/Mono.Net.Security/LegacySslStream.cs
+++ b/mcs/class/System/Mono.Net.Security/LegacySslStream.cs
@@ -83,8 +83,6 @@ namespace Mono.Net.Security
 		#region Fields
 
 		SslStreamBase ssl_stream;
-		MonoTlsProvider provider;
-		MonoTlsSettings settings;
 		ICertificateValidator certificateValidator;
 
 		#endregion // Fields
@@ -94,9 +92,7 @@ namespace Mono.Net.Security
 		public LegacySslStream (Stream innerStream, bool leaveInnerStreamOpen, MonoTlsProvider provider, MonoTlsSettings settings)
 			: base (innerStream, leaveInnerStreamOpen)
 		{
-			this.provider = provider;
-			this.settings = settings;
-			this.certificateValidator = ChainValidationHelper.GetDefaultValidator (provider, settings);
+			certificateValidator = ChainValidationHelper.GetDefaultValidator (provider, settings);
 		}
 		#endregion // Constructors
 
diff --git a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
index 762c74aba1a..f0a0be39e0e 100644
--- a/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
+++ b/mcs/class/System/Mono.Net.Security/SystemCertificateValidator.cs
@@ -44,7 +44,6 @@ namespace Mono.Net.Security
 	internal static class SystemCertificateValidator
 	{
 		static bool is_macosx;
-		static bool is_mobile;
 #if !MOBILE
 		static X509RevocationMode revocation_mode;
 #endif
@@ -53,13 +52,10 @@ namespace Mono.Net.Security
 		{
 #if MONOTOUCH
 			is_macosx = true;
-			is_mobile = true;
 #elif MONODROID
 			is_macosx = false;
-			is_mobile = true;
 #else
 			is_macosx = System.IO.File.Exists (OSX509Certificates.SecurityLibrary);
-			is_mobile = false;
 #endif
 
 #if !MOBILE