[System] Unify Mono.Security dependency to be same for all profiles

mcs/class/Mono.Security/Mono.Security.Cryptography/ARC4Managed.cs

@@ -24,6 +24,8 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !MONOTOUCH && !XAMMAC
+
 using System;
 using System.Globalization;
 using System.Security.Cryptography;
@@ -199,3 +201,5 @@ public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inpu
 		}
 	}
 }
+
+#endif

mcs/class/Mono.Security/monotouch_Mono.Security.dll.sources

@@ -1,3 +1,4 @@
-#include mobile_Mono.Security.dll.sources
+#include Mono.Security.dll.sources
 ../corlib/CommonCrypto/CommonCrypto.cs
 ../corlib/CommonCrypto/RC4CommonCrypto.cs
+Mono.Security.Interface/MonoTlsProviderFactory.Apple.cs

mcs/class/Mono.Security/xammac_Mono.Security.dll.sources

@@ -1,4 +1 @@
 #include monotouch_Mono.Security.dll.sources
-../corlib/CommonCrypto/CommonCrypto.cs
-../corlib/CommonCrypto/RC4CommonCrypto.cs
-

mcs/class/System/Makefile

@@ -19,15 +19,21 @@ TEST_RESOURCES = \
 	Test/System/test-uri-props-manual.txt \
 	Test/System/test-uri-relative-props.txt
 
+LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) -nowarn:436
+
 ifndef NO_MONO_SECURITY
 MONO_SECURITY=Mono.Security
 MONO_SECURITY_REF=MonoSecurity=Mono.Security
 MONO_SECURITY_DLL=$(the_libdir_base)Mono.Security.dll
+EXTERN_ALIAS_FLAGS = -d:MONO_SECURITY_ALIAS
+else
+LIB_MCS_FLAGS += -d:INSIDE_SYSTEM
 endif
 
 ifndef MOBILE_PROFILE
 TEST_LIB_REFS = System.Drawing $(MONO_SECURITY) System.Data System.Xml System.Core System.Configuration
 else
+LIB_MCS_FLAGS += -nowarn:618
 TEST_LIB_REFS = $(MONO_SECURITY) System.Data System.Xml System.Core
 endif
 
@@ -42,8 +48,6 @@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
 TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
 endif
 
-LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) -nowarn:436
-
 ifndef PROFILE_DISABLE_BTLS
 ifdef HAVE_BTLS
 
@@ -69,15 +73,6 @@ endif
 
 TXT_RESOURCE_STRINGS = ../referencesource/System/System.txt
 
-#
-# MOBILE_PROFILE needs SECURITY_DEP
-#
-ifdef MOBILE_PROFILE
-LIB_MCS_FLAGS += -d:INSIDE_SYSTEM -d:SECURITY_DEP -nowarn:618,1635
-else
-EXTERN_ALIAS_FLAGS = -d:MONO_SECURITY_ALIAS
-endif
-
 #
 # Flags used to build the secxml version of System.
 #

mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Apple.cs

@@ -1,7 +1,12 @@
 // Copyright 2015 Xamarin Inc. All rights reserved.
 #if SECURITY_DEP
-using System;
+
+#if MONO_SECURITY_ALIAS
+extern alias MonoSecurity;
+using MSI = MonoSecurity::Mono.Security.Interface;
+#else
 using MSI = Mono.Security.Interface;
+#endif
 
 namespace Mono.Net.Security
 {

mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs

@@ -1,11 +1,19 @@
 // Copyright 2015 Xamarin Inc. All rights reserved.
 #if SECURITY_DEP
-using System;
+
+#if MONO_SECURITY_ALIAS
+extern alias MonoSecurity;
+using MSI = MonoSecurity::Mono.Security.Interface;
+#else
 using MSI = Mono.Security.Interface;
+#endif
+
 #if MONO_FEATURE_BTLS
 using Mono.Btls;
 #endif
 
+using System;
+
 namespace Mono.Net.Security
 {
 	static partial class MonoTlsProviderFactory

mcs/class/System/System.Net.Security/SslStream.platformnotsupported.cs

@@ -36,30 +36,32 @@ public class SslStream : AuthenticatedStream
 		const string EXCEPTION_MESSAGE = "System.Net.Security.SslStream is not supported on the current platform.";
 
 		public SslStream (Stream innerStream)
-			: this (innerStream, false, null, null)
+			: this (innerStream, false)
 		{
 		}
 
 		public SslStream (Stream innerStream, bool leaveInnerStreamOpen)
-			: this (innerStream, leaveInnerStreamOpen, null, null)
+			: base (innerStream, leaveInnerStreamOpen)
 		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
 		public SslStream (Stream innerStream, bool leaveInnerStreamOpen, RemoteCertificateValidationCallback userCertificateValidationCallback)
-			: this (innerStream, leaveInnerStreamOpen, userCertificateValidationCallback, null)
+			: this (innerStream, leaveInnerStreamOpen)
 		{
 		}
 
+#if SECURITY_DEP
 		public SslStream (Stream innerStream, bool leaveInnerStreamOpen, RemoteCertificateValidationCallback userCertificateValidationCallback, LocalCertificateSelectionCallback userCertificateSelectionCallback)
-			: base (innerStream, leaveInnerStreamOpen)
+			: this (innerStream, leaveInnerStreamOpen)
 		{
-			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
 		public SslStream (Stream innerStream, bool leaveInnerStreamOpen, RemoteCertificateValidationCallback userCertificateValidationCallback, LocalCertificateSelectionCallback userCertificateSelectionCallback, EncryptionPolicy encryptionPolicy)
-			: this (innerStream, leaveInnerStreamOpen, userCertificateValidationCallback, userCertificateSelectionCallback)
+			: this (innerStream, leaveInnerStreamOpen)
 		{
 		}
+#endif
 
 		public virtual void AuthenticateAsClient (string targetHost)
 		{

mcs/class/System/System.Net/HttpListener.platformnotsupported.cs

@@ -46,10 +46,12 @@ public AuthenticationSchemes AuthenticationSchemes {
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
 
+#if SECURITY_DEP
 		public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate {
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
+#endif
 
 		public bool IgnoreWriteExceptions {
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }

mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs

@@ -49,7 +49,7 @@ public HttpListenerResponse Response {
 		public IPrincipal User {
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
-
+#if SECURITY_DEP
 		public Task<HttpListenerWebSocketContext> AcceptWebSocketAsync (string subProtocol)
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
@@ -69,5 +69,6 @@ public Task<HttpListenerWebSocketContext> AcceptWebSocketAsync (string subProtoc
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
+#endif
 	}
 }

mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainImplMono.cs

@@ -699,7 +699,7 @@ private bool IsSignedWith (X509Certificate2 signed, AsymmetricAlgorithm pubkey)
 			if (pubkey == null)
 				return false;
 			// Sadly X509Certificate2 doesn't expose the signature nor the tbs (to be signed) structure
-			MX.X509Certificate mx = signed.MonoCertificate;
+			var mx = signed.MonoCertificate;
 			return (mx.VerifySignature (pubkey));
 		}
 
@@ -725,7 +725,7 @@ static string GetAuthorityKeyIdentifier (MX.X509Extension ext)
 		{
 			if (ext == null)
 				return String.Empty;
-			MX.Extensions.AuthorityKeyIdentifierExtension aki = new MX.Extensions.AuthorityKeyIdentifierExtension (ext);
+			var aki = new MX.Extensions.AuthorityKeyIdentifierExtension (ext);
 			byte[] id = aki.Identifier;
 			if (id == null)	
 				return String.Empty;