Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -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;
}

View File

@@ -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

View File

@@ -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

View File

@@ -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) {