Imported Upstream version 4.4.0.122

Former-commit-id: a99f46acaeba3ab496c7afc02c29b839e30a0d0b

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

@@ -52,6 +52,7 @@ namespace System.Security.Cryptography.X509Certificates {
 			X500DistinguishedNameFlags.UseT61Encoding | X500DistinguishedNameFlags.ForceUTF8Encoding;
 
 		private string name;
+		private byte[] canonEncoding;
 
 
 		public X500DistinguishedName (AsnEncodedData encodedDistinguishedName)
@@ -122,6 +123,20 @@ namespace System.Security.Cryptography.X509Certificates {
 			name = distinguishedName.name;
 		}
 
+		internal X500DistinguishedName (byte[] encoded, byte[] canonEncoding, string name)
+			: this (encoded)
+		{
+			this.canonEncoding = canonEncoding;
+			this.name = name;
+
+			Oid = new Oid ();
+			RawData = encoded;
+		}
+
+		internal byte[] CanonicalEncoding {
+			get { return canonEncoding; }
+		}
+
 
 		public string Name {
 			get { return name; }
@@ -215,6 +230,16 @@ namespace System.Security.Cryptography.X509Certificates {
 			if (name2 == null)
 				return false;
 
+			if (name1.canonEncoding != null && name2.canonEncoding != null) {
+				if (name1.canonEncoding.Length != name2.canonEncoding.Length)
+					return false;
+				for (int i = 0; i < name1.canonEncoding.Length; i++) {
+					if (name1.canonEncoding[i] != name2.canonEncoding[2])
+						return false;
+				}
+				return true;
+			}
+
 			X500DistinguishedNameFlags flags = X500DistinguishedNameFlags.UseNewLines | X500DistinguishedNameFlags.DoNotUseQuotes;
 			string[] split = new string[] { Environment.NewLine };
 			string[] parts1 = name1.Decode (flags).Split (split, StringSplitOptions.RemoveEmptyEntries);

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

@@ -0,0 +1,82 @@
+//
+// X509Certificate2Impl.cs
+//
+// Authors:
+//	Martin Baulig  <martin.baulig@xamarin.com>
+//
+// Copyright (C) 2016 Xamarin, Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+namespace System.Security.Cryptography.X509Certificates
+{
+	internal abstract class X509Certificate2Impl : X509CertificateImpl
+	{
+#if SECURITY_DEP
+
+		public abstract bool Archived {
+			get; set;
+		}
+
+		public abstract X509ExtensionCollection Extensions {
+			get;
+		}
+
+		public abstract bool HasPrivateKey {
+			get;
+		}
+
+		public abstract X500DistinguishedName IssuerName {
+			get;
+		}
+
+		public abstract AsymmetricAlgorithm PrivateKey {
+			get; set;
+		}
+
+		public abstract PublicKey PublicKey {
+			get;
+		}
+
+		public abstract Oid SignatureAlgorithm {
+			get;
+		}
+
+		public abstract X500DistinguishedName SubjectName {
+			get;
+		}
+
+		public abstract int Version {
+			get;
+		}
+
+		public abstract string GetNameInfo (X509NameType nameType, bool forIssuer);
+
+		public abstract void Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags);
+
+		public abstract byte[] Export (X509ContentType contentType, string password);
+
+		public abstract bool Verify (X509Certificate2 thisCertificate);
+
+		public abstract void Reset ();
+
+#endif
+	}
+}

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

@@ -0,0 +1,81 @@
+//
+// X509ChainImpl.cs
+//
+// Authors:
+//	Martin Baulig  <martin.baulig@xamarin.com>
+//
+// Copyright (C) 2016 Xamarin, Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+#if SECURITY_DEP
+
+namespace System.Security.Cryptography.X509Certificates
+{
+	internal abstract class X509ChainImpl : IDisposable
+	{
+		public abstract bool IsValid {
+			get;
+		}
+
+		public abstract IntPtr Handle {
+			get;
+		}
+
+		protected void ThrowIfContextInvalid ()
+		{
+			if (!IsValid)
+				throw X509Helper2.GetInvalidChainContextException ();
+		}
+
+		public abstract X509ChainElementCollection ChainElements {
+			get;
+		}
+
+		public abstract X509ChainPolicy ChainPolicy {
+			get; set;
+		}
+
+		public abstract X509ChainStatus[] ChainStatus {
+			get;
+		}
+
+		public abstract bool Build (X509Certificate2 certificate);
+
+		public abstract void Reset ();
+
+		public void Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+		}
+
+		~X509ChainImpl ()
+		{
+			Dispose (false);
+		}
+	}
+}
+
+#endif

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

@@ -0,0 +1,119 @@
+//
+// X509Helper2.cs
+//
+// Authors:
+//	Martin Baulig  <martin.baulig@xamarin.com>
+//
+// Copyright (C) 2016 Xamarin, Inc. (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if SECURITY_DEP
+#if MONO_SECURITY_ALIAS
+extern alias MonoSecurity;
+#endif
+#if MONO_X509_ALIAS
+extern alias PrebuiltSystem;
+#endif
+
+#if MONO_SECURITY_ALIAS
+using MonoSecurity::Mono.Security.Interface;
+#else
+using Mono.Security.Interface;
+#endif
+
+namespace System.Security.Cryptography.X509Certificates
+{
+	internal static class X509Helper2
+	{
+		internal static void Initialize ()
+		{
+			X509Helper.InstallNativeHelper (new MyNativeHelper ());
+		}
+
+		internal static void ThrowIfContextInvalid (X509CertificateImpl impl)
+		{
+			X509Helper.ThrowIfContextInvalid (impl);
+		}
+
+		internal static X509Certificate2Impl Import (byte[] rawData, string password, X509KeyStorageFlags keyStorageFlags)
+		{
+			var provider = MonoTlsProviderFactory.GetProvider ();
+			if (provider.HasNativeCertificates) {
+				var impl = provider.GetNativeCertificate (rawData, password, keyStorageFlags);
+				return (X509Certificate2Impl)(object)impl;
+			} else {
+				var impl = new X509Certificate2ImplMono ();
+				impl.Import (rawData, password, keyStorageFlags);
+				return impl;
+			}
+		}
+
+		internal static X509Certificate2Impl Import (X509Certificate cert)
+		{
+			var provider = MonoTlsProviderFactory.GetProvider ();
+			if (provider.HasNativeCertificates) {
+				var impl = provider.GetNativeCertificate (cert);
+				return (X509Certificate2Impl)(object)impl;
+			}
+			var impl2 = cert.Impl as X509Certificate2Impl;
+			if (impl2 != null)
+				return (X509Certificate2Impl)impl2.Clone ();
+			return Import (cert.GetRawCertData (), null, X509KeyStorageFlags.DefaultKeySet);
+		}
+
+		internal static X509ChainImpl CreateChainImpl (bool useMachineContext)
+		{
+			return new X509ChainImplMono (useMachineContext);
+		}
+
+		public static bool IsValid (X509ChainImpl impl)
+		{
+			return impl != null && impl.IsValid;
+		}
+
+		internal static void ThrowIfContextInvalid (X509ChainImpl impl)
+		{
+			if (!IsValid (impl))
+				throw GetInvalidChainContextException ();
+		}
+
+		internal static Exception GetInvalidChainContextException ()
+		{
+			return new CryptographicException (Locale.GetText ("Chain instance is empty."));
+		}
+
+		class MyNativeHelper : INativeCertificateHelper
+		{
+			public X509CertificateImpl Import (
+				byte[] data, string password, X509KeyStorageFlags flags)
+			{
+				return X509Helper2.Import (data, password, flags);
+			}
+
+			public X509CertificateImpl Import (X509Certificate cert)
+			{
+				return X509Helper2.Import (cert);
+			}
+		}
+	}
+}
+#endif