From 208dd1e9568b584851ebbd1a6987eb89087fa09a Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 3 Jan 2017 15:13:57 +0100 Subject: [PATCH] [System] Unify Mono.Security dependency to be same for all profiles --- .../Mono.Security.Cryptography/ARC4Managed.cs | 4 + .../mobile_Mono.Security.dll.sources | 129 ------------------ .../monodroid_Mono.Security.dll.sources | 5 - .../monotouch_Mono.Security.dll.sources | 3 +- .../monotouch_watch_Mono.Security.dll.sources | 1 - ...testing_aot_full_Mono.Security.dll.sources | 5 - ...sting_aot_hybrid_Mono.Security.dll.sources | 5 - .../winaot_Mono.Security.dll.sources | 5 - .../xammac_Mono.Security.dll.sources | 3 - mcs/class/System/Makefile | 17 +-- .../MonoTlsProviderFactory.Apple.cs | 7 +- .../MonoTlsProviderFactory.Droid.cs | 10 +- .../SslStream.platformnotsupported.cs | 14 +- .../HttpListener.platformnotsupported.cs | 2 + ...ttpListenerContext.platformnotsupported.cs | 3 +- .../X509ChainImplMono.cs | 4 +- mcs/class/System/mobile_System.dll.sources | 95 ------------- mcs/class/System/monotouch_System.dll.sources | 1 - ...monotouch_watch_System.dll.exclude.sources | 88 ------------ .../System/monotouch_watch_System.dll.sources | 1 + mcs/class/System/xammac_System.dll.sources | 1 - 21 files changed, 42 insertions(+), 361 deletions(-) delete mode 100644 mcs/class/Mono.Security/mobile_Mono.Security.dll.sources delete mode 100644 mcs/class/Mono.Security/monodroid_Mono.Security.dll.sources delete mode 100644 mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources delete mode 100644 mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources delete mode 100644 mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources delete mode 100644 mcs/class/Mono.Security/winaot_Mono.Security.dll.sources diff --git a/mcs/class/Mono.Security/Mono.Security.Cryptography/ARC4Managed.cs b/mcs/class/Mono.Security/Mono.Security.Cryptography/ARC4Managed.cs index 78cda036a91..dc987b05cfc 100644 --- a/mcs/class/Mono.Security/Mono.Security.Cryptography/ARC4Managed.cs +++ b/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 @@ namespace Mono.Security.Cryptography { } } } + +#endif \ No newline at end of file diff --git a/mcs/class/Mono.Security/mobile_Mono.Security.dll.sources b/mcs/class/Mono.Security/mobile_Mono.Security.dll.sources deleted file mode 100644 index 2e938683b3a..00000000000 --- a/mcs/class/Mono.Security/mobile_Mono.Security.dll.sources +++ /dev/null @@ -1,129 +0,0 @@ -./Assembly/AssemblyInfo.cs -../../build/common/Consts.cs -../../build/common/Locale.cs -./Mono.Math/BigInteger.cs -./Mono.Math.Prime/ConfidenceFactor.cs -./Mono.Math.Prime/PrimalityTests.cs -./Mono.Math.Prime.Generator/NextPrimeFinder.cs -./Mono.Math.Prime.Generator/PrimeGeneratorBase.cs -./Mono.Math.Prime.Generator/SequentialSearchPrimeGeneratorBase.cs -./Mono.Security/ASN1.cs -./Mono.Security/ASN1Convert.cs -./Mono.Security/BitConverterLE.cs -./Mono.Security/PKCS7.cs -./Mono.Security/StrongName.cs -./Mono.Security.Authenticode/AuthenticodeBase.cs -./Mono.Security.Authenticode/AuthenticodeDeformatter.cs -./Mono.Security.Authenticode/AuthenticodeFormatter.cs -./Mono.Security.Authenticode/SoftwarePublisherCertificate.cs -./Mono.Security.Authenticode/PrivateKey.cs -./Mono.Security.Cryptography/CryptoConvert.cs -./Mono.Security.Cryptography/CryptoTools.cs -./Mono.Security.Cryptography/DHKeyGeneration.cs -./Mono.Security.Cryptography/DHParameters.cs -./Mono.Security.Cryptography/DiffieHellman.cs -./Mono.Security.Cryptography/DiffieHellmanManaged.cs -./Mono.Security.Cryptography/KeyPairPersistence.cs -./Mono.Security.Cryptography/MD2.cs -./Mono.Security.Cryptography/MD4.cs -./Mono.Security.Cryptography/PKCS1.cs -./Mono.Security.Cryptography/PKCS8.cs -./Mono.Security.Cryptography/RC4.cs -./Mono.Security.Cryptography/RSAManaged.cs -./Mono.Security.Cryptography/SHA224.cs -./Mono.Security.Cryptography/SymmetricTransform.cs -./Mono.Security.X509/PKCS12.cs -./Mono.Security.X509/X501Name.cs -./Mono.Security.X509/X509Builder.cs -./Mono.Security.X509/X509Certificate.cs -./Mono.Security.X509/X509CertificateCollection.cs -./Mono.Security.X509/X509CertificateBuilder.cs -./Mono.Security.X509/X509Chain.cs -./Mono.Security.X509/X509ChainStatusFlags.cs -./Mono.Security.X509/X509CRL.cs -./Mono.Security.X509/X509Extension.cs -./Mono.Security.X509/X509Extensions.cs -./Mono.Security.X509/X509Store.cs -./Mono.Security.X509/X509StoreManager.cs -./Mono.Security.X509/X509Stores.cs -./Mono.Security.X509/X520Attributes.cs -./Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtension.cs -./Mono.Security.X509.Extensions/BasicConstraintsExtension.cs -./Mono.Security.X509.Extensions/CRLDistributionPointsExtension.cs -./Mono.Security.X509.Extensions/CertificatePoliciesExtension.cs -./Mono.Security.X509.Extensions/ExtendedKeyUsageExtension.cs -./Mono.Security.X509.Extensions/GeneralNames.cs -./Mono.Security.X509.Extensions/KeyAttributesExtension.cs -./Mono.Security.X509.Extensions/KeyUsageExtension.cs -./Mono.Security.X509.Extensions/NetscapeCertTypeExtension.cs -./Mono.Security.X509.Extensions/PrivateKeyUsagePeriodExtension.cs -./Mono.Security.X509.Extensions/SubjectAltNameExtension.cs -./Mono.Security.X509.Extensions/SubjectKeyIdentifierExtension.cs -./Mono.Security.Cryptography/TlsHMAC.cs -./Mono.Security.Cryptography/MD5SHA1.cs -./Mono.Security.Protocol.Tls/Alert.cs -./Mono.Security.Protocol.Tls/CipherAlgorithmType.cs -./Mono.Security.Protocol.Tls/CipherSuite.cs -./Mono.Security.Protocol.Tls/CipherSuiteCollection.cs -./Mono.Security.Protocol.Tls/CipherSuiteFactory.cs -./Mono.Security.Protocol.Tls/ClientContext.cs -./Mono.Security.Protocol.Tls/ClientRecordProtocol.cs -./Mono.Security.Protocol.Tls/ClientSessionCache.cs -./Mono.Security.Protocol.Tls/ContentType.cs -./Mono.Security.Protocol.Tls/Context.cs -./Mono.Security.Protocol.Tls/DebugHelper.cs -./Mono.Security.Protocol.Tls/ExchangeAlgorithmType.cs -./Mono.Security.Protocol.Tls/HandshakeState.cs -./Mono.Security.Protocol.Tls/HashAlgorithmType.cs -./Mono.Security.Protocol.Tls/HttpsClientStream.cs -./Mono.Security.Protocol.Tls/RecordProtocol.cs -./Mono.Security.Protocol.Tls/RSASslSignatureDeformatter.cs -./Mono.Security.Protocol.Tls/RSASslSignatureFormatter.cs -./Mono.Security.Protocol.Tls/SecurityCompressionType.cs -./Mono.Security.Protocol.Tls/SecurityParameters.cs -./Mono.Security.Protocol.Tls/SecurityProtocolType.cs -./Mono.Security.Protocol.Tls/ServerContext.cs -./Mono.Security.Protocol.Tls/ServerRecordProtocol.cs -./Mono.Security.Protocol.Tls/SslClientStream.cs -./Mono.Security.Protocol.Tls/SslCipherSuite.cs -./Mono.Security.Protocol.Tls/SslHandshakeHash.cs -./Mono.Security.Protocol.Tls/SslServerStream.cs -./Mono.Security.Protocol.Tls/SslStreamBase.cs -./Mono.Security.Protocol.Tls/TlsCipherSuite.cs -./Mono.Security.Protocol.Tls/TlsClientSettings.cs -./Mono.Security.Protocol.Tls/TlsException.cs -./Mono.Security.Protocol.Tls/TlsServerSettings.cs -./Mono.Security.Protocol.Tls/TlsStream.cs -./Mono.Security.Protocol.Tls.Handshake/ClientCertificateType.cs -./Mono.Security.Protocol.Tls.Handshake/HandshakeMessage.cs -./Mono.Security.Protocol.Tls.Handshake/HandshakeType.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsClientHello.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificateRequest.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHello.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHelloDone.cs -./Mono.Security.Protocol.Tls.Handshake.Client/TlsServerKeyExchange.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificate.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificateVerify.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsClientFinished.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsClientHello.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsClientKeyExchange.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificate.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificateRequest.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerFinished.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHello.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHelloDone.cs -./Mono.Security.Protocol.Tls.Handshake.Server/TlsServerKeyExchange.cs -./Mono.Xml/MiniParser.cs -./Mono.Xml/SecurityParser.cs - -./Mono.Security.Interface/BufferOffsetSize.cs -./Mono.Security.Interface/SecretParameters.cs -./Mono.Security.Interface/SecureBuffer.cs -./Mono.Security.Interface/TlsBuffer.cs -./Mono.Security.Interface/TlsMultiBuffer.cs diff --git a/mcs/class/Mono.Security/monodroid_Mono.Security.dll.sources b/mcs/class/Mono.Security/monodroid_Mono.Security.dll.sources deleted file mode 100644 index 87eaa009cd8..00000000000 --- a/mcs/class/Mono.Security/monodroid_Mono.Security.dll.sources +++ /dev/null @@ -1,5 +0,0 @@ -#include mobile_Mono.Security.dll.sources -./Mono.Security.Cryptography/ARC4Managed.cs -./Mono.Security.Cryptography/MD2Managed.cs -./Mono.Security.Cryptography/MD4Managed.cs -./Mono.Security.Cryptography/SHA224Managed.cs diff --git a/mcs/class/Mono.Security/monotouch_Mono.Security.dll.sources b/mcs/class/Mono.Security/monotouch_Mono.Security.dll.sources index 36918de7763..463682e1d99 100644 --- a/mcs/class/Mono.Security/monotouch_Mono.Security.dll.sources +++ b/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 diff --git a/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources b/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources deleted file mode 100644 index 8e39387108d..00000000000 --- a/mcs/class/Mono.Security/monotouch_watch_Mono.Security.dll.sources +++ /dev/null @@ -1 +0,0 @@ -#include monotouch_Mono.Security.dll.sources diff --git a/mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources b/mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources deleted file mode 100644 index 87eaa009cd8..00000000000 --- a/mcs/class/Mono.Security/testing_aot_full_Mono.Security.dll.sources +++ /dev/null @@ -1,5 +0,0 @@ -#include mobile_Mono.Security.dll.sources -./Mono.Security.Cryptography/ARC4Managed.cs -./Mono.Security.Cryptography/MD2Managed.cs -./Mono.Security.Cryptography/MD4Managed.cs -./Mono.Security.Cryptography/SHA224Managed.cs diff --git a/mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources b/mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources deleted file mode 100644 index 87eaa009cd8..00000000000 --- a/mcs/class/Mono.Security/testing_aot_hybrid_Mono.Security.dll.sources +++ /dev/null @@ -1,5 +0,0 @@ -#include mobile_Mono.Security.dll.sources -./Mono.Security.Cryptography/ARC4Managed.cs -./Mono.Security.Cryptography/MD2Managed.cs -./Mono.Security.Cryptography/MD4Managed.cs -./Mono.Security.Cryptography/SHA224Managed.cs diff --git a/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources b/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources deleted file mode 100644 index 87eaa009cd8..00000000000 --- a/mcs/class/Mono.Security/winaot_Mono.Security.dll.sources +++ /dev/null @@ -1,5 +0,0 @@ -#include mobile_Mono.Security.dll.sources -./Mono.Security.Cryptography/ARC4Managed.cs -./Mono.Security.Cryptography/MD2Managed.cs -./Mono.Security.Cryptography/MD4Managed.cs -./Mono.Security.Cryptography/SHA224Managed.cs diff --git a/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources b/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources index 698996a1d70..8e39387108d 100644 --- a/mcs/class/Mono.Security/xammac_Mono.Security.dll.sources +++ b/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 - diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 65c6be9a314..b637c731656 100644 --- a/mcs/class/System/Makefile +++ b/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. # diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Apple.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Apple.cs index 89735c6bacb..787de757757 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Apple.cs +++ b/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 { diff --git a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs b/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs index f9bd47396e6..49ac9fde664 100644 --- a/mcs/class/System/Mono.Net.Security/MonoTlsProviderFactory.Droid.cs +++ b/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 diff --git a/mcs/class/System/System.Net.Security/SslStream.platformnotsupported.cs b/mcs/class/System/System.Net.Security/SslStream.platformnotsupported.cs index 1d3f040c082..9024c52306b 100644 --- a/mcs/class/System/System.Net.Security/SslStream.platformnotsupported.cs +++ b/mcs/class/System/System.Net.Security/SslStream.platformnotsupported.cs @@ -36,30 +36,32 @@ namespace System.Net.Security 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) { diff --git a/mcs/class/System/System.Net/HttpListener.platformnotsupported.cs b/mcs/class/System/System.Net/HttpListener.platformnotsupported.cs index 88ae1d361e3..c16004e754a 100644 --- a/mcs/class/System/System.Net/HttpListener.platformnotsupported.cs +++ b/mcs/class/System/System.Net/HttpListener.platformnotsupported.cs @@ -46,10 +46,12 @@ namespace System.Net { 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); } diff --git a/mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs b/mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs index 275d6d4ad14..71e3d48649b 100644 --- a/mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs +++ b/mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs @@ -49,7 +49,7 @@ namespace System.Net { public IPrincipal User { get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } } - +#if SECURITY_DEP public Task AcceptWebSocketAsync (string subProtocol) { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); @@ -69,5 +69,6 @@ namespace System.Net { { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); } +#endif } } diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainImplMono.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainImplMono.cs index 210bd8fc911..de9b1990e86 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainImplMono.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509ChainImplMono.cs @@ -699,7 +699,7 @@ namespace System.Security.Cryptography.X509Certificates { 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 @@ namespace System.Security.Cryptography.X509Certificates { { 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; diff --git a/mcs/class/System/mobile_System.dll.sources b/mcs/class/System/mobile_System.dll.sources index 91ca509a04b..aaa9ab17047 100644 --- a/mcs/class/System/mobile_System.dll.sources +++ b/mcs/class/System/mobile_System.dll.sources @@ -1,97 +1,2 @@ #include common.sources - System.IO/FileSystemWatcher_mobile.cs - -../Mono.Security/Mono.Security.Authenticode/PrivateKey.cs -../Mono.Security/Mono.Security.Cryptography/MD5SHA1.cs -../Mono.Security/Mono.Security.Cryptography/TlsHMAC.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/ChallengeResponse.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/ChallengeResponse2.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/MessageBase.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmAuthLevel.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmFlags.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmSettings.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type1Message.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type2Message.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs -../Mono.Security/Mono.Security.Protocol.Tls/Alert.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteCollection.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientContext.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientRecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs -../Mono.Security/Mono.Security.Protocol.Tls/ContentType.cs -../Mono.Security/Mono.Security.Protocol.Tls/Context.cs -../Mono.Security/Mono.Security.Protocol.Tls/DebugHelper.cs -../Mono.Security/Mono.Security.Protocol.Tls/ExchangeAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/HandshakeState.cs -../Mono.Security/Mono.Security.Protocol.Tls/HashAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/RSASslSignatureDeformatter.cs -../Mono.Security/Mono.Security.Protocol.Tls/RSASslSignatureFormatter.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityCompressionType.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityParameters.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityProtocolType.cs -../Mono.Security/Mono.Security.Protocol.Tls/ServerContext.cs -../Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslClientStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslCipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslHandshakeHash.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslServerStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslStreamBase.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsCipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsClientSettings.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsException.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsServerSettings.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsStream.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/ClientCertificateType.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/HandshakeMessage.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/HandshakeType.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificateRequest.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHelloDone.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificateVerify.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificateRequest.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHelloDone.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerKeyExchange.cs -../Mono.Security/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtension.cs -../Mono.Security/Mono.Security.X509.Extensions/ExtendedKeyUsageExtension.cs -../Mono.Security/Mono.Security.X509.Extensions/GeneralNames.cs -../Mono.Security/Mono.Security.X509.Extensions/NetscapeCertTypeExtension.cs -../Mono.Security/Mono.Security.X509.Extensions/SubjectAltNameExtension.cs - -../Mono.Security/Mono.Security.Interface/Alert.cs -../Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs -../Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs -../Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs -../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs -../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs -../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs -../Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs -../Mono.Security/Mono.Security.Interface/TlsException.cs -../Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs -../Mono.Security/Mono.Security.Interface/TlsProtocols.cs - diff --git a/mcs/class/System/monotouch_System.dll.sources b/mcs/class/System/monotouch_System.dll.sources index b762471075b..e385101400f 100644 --- a/mcs/class/System/monotouch_System.dll.sources +++ b/mcs/class/System/monotouch_System.dll.sources @@ -4,4 +4,3 @@ System.Net/MacProxy.cs Mono.Util/MonoPInvokeCallbackAttribute.cs Mono.Net.Security/MonoTlsProviderFactory.Apple.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.Apple.cs diff --git a/mcs/class/System/monotouch_watch_System.dll.exclude.sources b/mcs/class/System/monotouch_watch_System.dll.exclude.sources index 8d7969bf906..d5e3ca4f944 100644 --- a/mcs/class/System/monotouch_watch_System.dll.exclude.sources +++ b/mcs/class/System/monotouch_watch_System.dll.exclude.sources @@ -1,91 +1,3 @@ -../Mono.Security/Mono.Security.Authenticode/PrivateKey.cs -../Mono.Security/Mono.Security.Cryptography/MD5SHA1.cs -../Mono.Security/Mono.Security.Cryptography/TlsHMAC.cs -../Mono.Security/Mono.Security.Interface/Alert.cs -../Mono.Security/Mono.Security.Interface/CertificateValidationHelper.cs -../Mono.Security/Mono.Security.Interface/CipherAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/CipherSuiteCode.cs -../Mono.Security/Mono.Security.Interface/ExchangeAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/HashAlgorithmType.cs -../Mono.Security/Mono.Security.Interface/IBufferOffsetSize.cs -../Mono.Security/Mono.Security.Interface/IMonoSslStream.cs -../Mono.Security/Mono.Security.Interface/IMonoTlsContext.cs -../Mono.Security/Mono.Security.Interface/IMonoTlsEventSink.cs -../Mono.Security/Mono.Security.Interface/MonoTlsConnectionInfo.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.Apple.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs -../Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs -../Mono.Security/Mono.Security.Interface/TlsException.cs -../Mono.Security/Mono.Security.Interface/TlsProtocolCode.cs -../Mono.Security/Mono.Security.Interface/TlsProtocols.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/ChallengeResponse.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/ChallengeResponse2.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/MessageBase.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmAuthLevel.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmFlags.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/NtlmSettings.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type1Message.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type2Message.cs -../Mono.Security/Mono.Security.Protocol.Ntlm/Type3Message.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificateRequest.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerHelloDone.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientCertificateVerify.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsClientKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificate.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerCertificateRequest.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerFinished.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHello.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerHelloDone.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake.Server/TlsServerKeyExchange.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/ClientCertificateType.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/HandshakeMessage.cs -../Mono.Security/Mono.Security.Protocol.Tls.Handshake/HandshakeType.cs -../Mono.Security/Mono.Security.Protocol.Tls/Alert.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteCollection.cs -../Mono.Security/Mono.Security.Protocol.Tls/CipherSuiteFactory.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientContext.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientRecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/ClientSessionCache.cs -../Mono.Security/Mono.Security.Protocol.Tls/ContentType.cs -../Mono.Security/Mono.Security.Protocol.Tls/Context.cs -../Mono.Security/Mono.Security.Protocol.Tls/DebugHelper.cs -../Mono.Security/Mono.Security.Protocol.Tls/ExchangeAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/HandshakeState.cs -../Mono.Security/Mono.Security.Protocol.Tls/HashAlgorithmType.cs -../Mono.Security/Mono.Security.Protocol.Tls/HttpsClientStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/RecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/RSASslSignatureDeformatter.cs -../Mono.Security/Mono.Security.Protocol.Tls/RSASslSignatureFormatter.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityCompressionType.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityParameters.cs -../Mono.Security/Mono.Security.Protocol.Tls/SecurityProtocolType.cs -../Mono.Security/Mono.Security.Protocol.Tls/ServerContext.cs -../Mono.Security/Mono.Security.Protocol.Tls/ServerRecordProtocol.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslCipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslClientStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslHandshakeHash.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslServerStream.cs -../Mono.Security/Mono.Security.Protocol.Tls/SslStreamBase.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsCipherSuite.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsClientSettings.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsException.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsServerSettings.cs -../Mono.Security/Mono.Security.Protocol.Tls/TlsStream.cs Mono.Http/NtlmClient.cs Mono.Net.Security/AsyncProtocolRequest.cs Mono.Net.Security/CallbackHelpers.cs diff --git a/mcs/class/System/monotouch_watch_System.dll.sources b/mcs/class/System/monotouch_watch_System.dll.sources index f7e73d81e36..60e5cae4053 100644 --- a/mcs/class/System/monotouch_watch_System.dll.sources +++ b/mcs/class/System/monotouch_watch_System.dll.sources @@ -18,3 +18,4 @@ System.Net/HttpWebRequest.platformnotsupported.cs System.Net/HttpWebResponse.platformnotsupported.cs System.Net/ServicePoint.platformnotsupported.cs System.Net/ServicePointManager.platformnotsupported.cs +../Mono.Security/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtension.cs diff --git a/mcs/class/System/xammac_System.dll.sources b/mcs/class/System/xammac_System.dll.sources index bb3efb2a119..73405e10266 100644 --- a/mcs/class/System/xammac_System.dll.sources +++ b/mcs/class/System/xammac_System.dll.sources @@ -1,3 +1,2 @@ #include mobile_System.dll.sources Mono.Net.Security/MonoTlsProviderFactory.Apple.cs -../Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.Apple.cs -- 2.25.1