Commit 9a3924c4 authored by justcoding121's avatar justcoding121

update StreamExtended package

parent ea32f147
......@@ -106,8 +106,8 @@ namespace Titanium.Web.Proxy.Network.Tcp
if (isHttps)
{
var alpnStream = ProxyServer.AlpnEnabled ? (Stream)new ClientHelloAlpnAdderStream(stream) : stream;
var sslStream = new SslStream(alpnStream, false, server.ValidateServerCertificate, server.SelectClientCertificate);
var sslStream = new SslStream(stream, false, server.ValidateServerCertificate, server.SelectClientCertificate);
stream = new CustomBufferedStream(sslStream, server.BufferSize);
await sslStream.AuthenticateAsClientAsync(remoteHostName, null, server.SupportedSslProtocols, server.CheckCertificateRevocation);
......
......@@ -110,7 +110,7 @@ namespace Titanium.Web.Proxy
connectArgs.WebSession.Response = ConnectResponse.CreateSuccessfullConnectResponse(version);
await clientStreamWriter.WriteResponseAsync(connectArgs.WebSession.Response);
var clientHelloInfo = await SslTools.GetClientHelloInfo(clientStream);
var clientHelloInfo = await SslTools.PeekClientHello(clientStream);
bool isClientHello = clientHelloInfo != null;
if (isClientHello)
{
......@@ -132,8 +132,8 @@ namespace Titanium.Web.Proxy
try
{
var alpnStream = AlpnEnabled ? (Stream)new ServerHelloAlpnAdderStream(clientStream) : clientStream;
sslStream = new SslStream(alpnStream);
sslStream = new SslStream(clientStream);
string certName = HttpHelper.GetWildCardDomainName(httpRemoteUri.Host);
......@@ -175,7 +175,7 @@ namespace Titanium.Web.Proxy
await connection.Stream.FlushAsync();
}
var serverHelloInfo = await SslTools.GetServerHelloInfo(connection.Stream);
var serverHelloInfo = await SslTools.PeekServerHello(connection.Stream);
((ConnectResponse)connectArgs.WebSession.Response).ServerHelloInfo = serverHelloInfo;
}
......@@ -224,7 +224,7 @@ namespace Titanium.Web.Proxy
{
if (endPoint.EnableSsl)
{
var clientSslHelloInfo = await SslTools.GetClientHelloInfo(clientStream);
var clientSslHelloInfo = await SslTools.PeekClientHello(clientStream);
if (clientSslHelloInfo != null)
{
......
......@@ -34,7 +34,7 @@
<ItemGroup>
<PackageReference Include="Portable.BouncyCastle" Version="1.8.1.2" />
<PackageReference Include="StreamExtended" Version="1.0.17" />
<PackageReference Include="StreamExtended" Version="1.0.18" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="System.Net.Security" Version="4.3.1" />
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
......
......@@ -50,8 +50,8 @@
<HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StreamExtended, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
<HintPath>..\packages\StreamExtended.1.0.17\lib\net45\StreamExtended.dll</HintPath>
<Reference Include="StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
<HintPath>..\packages\StreamExtended.1.0.18\lib\net45\StreamExtended.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle" version="1.8.1" targetFramework="net45" />
<package id="StreamExtended" version="1.0.17" targetFramework="net45" />
<package id="StreamExtended" version="1.0.18" targetFramework="net45" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment