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

@ -81,16 +81,16 @@ namespace Mono.Net.Security.Private
SslStreamBase ssl_stream;
ICertificateValidator certificateValidator;
MonoTlsProvider provider;
#endregion // Fields
#region Constructors
public LegacySslStream (Stream innerStream, bool leaveInnerStreamOpen, MonoTlsProvider provider, MonoTlsSettings settings)
public LegacySslStream (Stream innerStream, bool leaveInnerStreamOpen, SslStream owner, MonoTlsProvider provider, MonoTlsSettings settings)
: base (innerStream, leaveInnerStreamOpen)
{
this.provider = provider;
SslStream = owner;
Provider = provider;
certificateValidator = ChainValidationHelper.GetInternalValidator (provider, settings);
}
#endregion // Constructors
@ -575,6 +575,11 @@ namespace Mono.Net.Security.Private
#region IMonoSslStream
Task IMonoSslStream.ShutdownAsync ()
{
return Task.CompletedTask;
}
AuthenticatedStream IMonoSslStream.AuthenticatedStream {
get { return this; }
}
@ -583,11 +588,15 @@ namespace Mono.Net.Security.Private
get { throw new NotSupportedException (); }
}
MonoTlsProvider IMonoSslStream.Provider {
get { return provider; }
public SslStream SslStream {
get;
}
MonoTlsConnectionInfo IMonoSslStream.GetConnectionInfo ()
public MonoTlsProvider Provider {
get;
}
public MonoTlsConnectionInfo GetConnectionInfo ()
{
return null;
}