Commit 14bdb652 authored by justcoding121's avatar justcoding121

Merge branch 'beta' into stable

parents ca5dfbc2 dd688aa1
...@@ -42,7 +42,7 @@ namespace Titanium.Web.Proxy.Examples.Basic ...@@ -42,7 +42,7 @@ namespace Titanium.Web.Proxy.Examples.Basic
//optionally set the Certificate Engine //optionally set the Certificate Engine
//Under Mono only BouncyCastle will be supported //Under Mono only BouncyCastle will be supported
//proxyServer.CertificateEngine = Network.CertificateEngine.BouncyCastle; //proxyServer.CertificateEngine = Network.CertificateEngine.DefaultWindows;
//optionally set the Root Certificate //optionally set the Root Certificate
//proxyServer.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable); //proxyServer.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable);
......
...@@ -126,7 +126,7 @@ namespace Titanium.Web.Proxy.Network ...@@ -126,7 +126,7 @@ namespace Titanium.Web.Proxy.Network
internal CertificateManager(Action<Exception> exceptionFunc) internal CertificateManager(Action<Exception> exceptionFunc)
{ {
this.exceptionFunc = exceptionFunc; this.exceptionFunc = exceptionFunc;
Engine = CertificateEngine.DefaultWindows; Engine = CertificateEngine.BouncyCastle;
certificateCache = new ConcurrentDictionary<string, CachedCertificate>(); certificateCache = new ConcurrentDictionary<string, CachedCertificate>();
} }
......
...@@ -36,11 +36,6 @@ namespace Titanium.Web.Proxy ...@@ -36,11 +36,6 @@ namespace Titanium.Web.Proxy
internal const string UriSchemeHttps = "https"; internal const string UriSchemeHttps = "https";
#endif #endif
/// <summary>
/// Enable the experimental ALPN adder streams
/// </summary>
internal static bool AlpnEnabled = false;
/// <summary> /// <summary>
/// Is the proxy currently running /// Is the proxy currently running
/// </summary> /// </summary>
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942"> <Reference Include="BouncyCastle.Crypto">
<HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath> <HintPath>..\packages\Portable.BouncyCastle.1.8.1.2\lib\net4\BouncyCastle.Crypto.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL"> <Reference Include="StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<metadata> <metadata>
<id>Titanium.Web.Proxy</id> <id>Titanium.Web.Proxy</id>
<version>$version$</version> <version>$version$</version>
<title>Titanium web proxy</title> <title>Titanium Web Proxy</title>
<authors>Titanium</authors> <authors>Titanium Web Proxy GitHub Contributors</authors>
<owners>Titanium</owners> <owners>justcoding121</owners>
<licenseUrl>https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/LICENSE</licenseUrl> <licenseUrl>https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/LICENSE</licenseUrl>
<projectUrl>https://github.com/justcoding121/Titanium-Web-Proxy</projectUrl> <projectUrl>https://github.com/justcoding121/Titanium-Web-Proxy</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
...@@ -14,14 +14,8 @@ ...@@ -14,14 +14,8 @@
<copyright>Copyright &#x00A9; Titanium. All rights reserved.</copyright> <copyright>Copyright &#x00A9; Titanium. All rights reserved.</copyright>
<tags></tags> <tags></tags>
<dependencies> <dependencies>
<group targetFramework="net45">
<dependency id="StreamExtended" version="1.0.18" /> <dependency id="StreamExtended" version="1.0.18" />
<dependency id="BouncyCastle" version="1.8.1" /> <dependency id="Portable.BouncyCastle" version="1.8.1.2" />
</group>
<group targetFramework="netstandard1.6">
<dependency id="StreamExtended" version="1.0.18" />
<dependency id="Portable.BouncyCastle" version="1.8.1.2" />
</group>
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="BouncyCastle" version="1.8.1" targetFramework="net45" /> <package id="Portable.BouncyCastle" version="1.8.1.2" targetFramework="net45" />
<package id="StreamExtended" version="1.0.18" targetFramework="net45" /> <package id="StreamExtended" version="1.0.18" targetFramework="net45" />
</packages> </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