Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/Mono.Security/Mono.Security.Interface/IMonoSslStream.cs

@@ -38,6 +38,10 @@ namespace Mono.Security.Interface
 {
 	public interface IMonoSslStream : IDisposable
 	{
+		SslStream SslStream {
+			get;
+		}
+
 		void AuthenticateAsClient (string targetHost);
 
 		void AuthenticateAsClient (string targetHost, X509CertificateCollection clientCertificates, SSA.SslProtocols enabledSslProtocols, bool checkCertificateRevocation);
@@ -82,6 +86,8 @@ namespace Mono.Security.Interface
 
 		void EndWrite (IAsyncResult asyncResult);
 
+		Task ShutdownAsync ();
+
 		TransportContext TransportContext {
 			get;
 		}

mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProvider.cs

@@ -122,6 +122,10 @@ namespace Mono.Security.Interface
 			Stream innerStream, bool leaveInnerStreamOpen,
 			MonoTlsSettings settings = null);
 
+		internal abstract IMonoSslStream CreateSslStreamInternal (
+			SslStream sslStream, Stream innerStream, bool leaveInnerStreamOpen,
+			MonoTlsSettings settings);
+
 #endregion
 
 #region Native Certificate Implementation

mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsProviderFactory.cs

@@ -161,20 +161,9 @@ namespace Mono.Security.Interface
 			return (IMonoSslStream)NoReflectionHelper.GetMonoSslStream (stream);
 		}
 
-		#endregion
-
-		#region Obsolete APIs
-
-		[Obsolete ("Use GetProvider() instead.")]
-		public static MonoTlsProvider GetDefaultProvider ()
+		public static IMonoSslStream GetMonoSslStream (HttpListenerContext context)
 		{
-			return GetProvider ();
-		}
-
-		[Obsolete ("Use Initialize(string provider) instead.")]
-		public static void SetDefaultProvider (string name)
-		{
-			Initialize (name);
+			return (IMonoSslStream)NoReflectionHelper.GetMonoSslStream (context);
 		}
 
 		#endregion

mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs

@@ -1,4 +1,4 @@
-//
+//
 // MonoTlsSettings.cs
 //
 // Author:
@@ -64,6 +64,13 @@ namespace Mono.Security.Interface
 			set { callbackNeedsChain = value; }
 		}
 
+		/*
+		 * Use custom time for certificate expiration checks
+		 */
+		public DateTime? CertificateValidationTime {
+			get; set;
+		}
+
 		/*
 		 * This is only supported if CertificateValidationHelper.SupportsTrustAnchors is true.
 		 */
@@ -165,6 +172,7 @@ namespace Mono.Security.Interface
 			UserSettings = other.UserSettings;
 			EnabledProtocols = other.EnabledProtocols;
 			EnabledCiphers = other.EnabledCiphers;
+			CertificateValidationTime = other.CertificateValidationTime;
 			if (other.TrustAnchors != null)
 				TrustAnchors = new X509CertificateCollection (other.TrustAnchors);
 			if (other.CertificateSearchPaths != null) {

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

@@ -27,6 +27,7 @@ Mono.Security.Cryptography/PKCS8Test.cs
 Mono.Security.Cryptography/RSAManagedTest.cs
 Mono.Security.Cryptography/SHA224ManagedTest.cs
 Mono.Security.Cryptography/SHA224Test.cs
+Mono.Security.Interface/TestProvider.cs
 Mono.Security.Protocol.Ntlm/ChallengeResponseTest.cs
 Mono.Security.Protocol.Ntlm/MessageBaseTest.cs
 Mono.Security.Protocol.Ntlm/Type1MessageTest.cs

mcs/class/Mono.Security/Test/Mono.Security.Interface/TestProvider.cs

@@ -0,0 +1,47 @@
+//
+// TestProvider.cs
+//
+// Author:
+//       Martin Baulig <mabaul@microsoft.com>
+//
+// Copyright (c) 2017 Xamarin, Inc.
+//
+// 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.
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+using Mono.Security;
+using Mono.Security.Interface;
+using NUnit.Framework;
+
+namespace MonoTests.Mono.Security
+{
+	[TestFixture]
+	public class TestProvider
+	{
+		[Test]
+		public void GetProvider ()
+		{
+			var provider = MonoTlsProviderFactory.GetProvider ();
+			Assert.IsNotNull (provider, "TLS Provider");
+		}
+	}
+}