Merge branch 'beta' into stable

Serg2DFX · Jul 13, 2017 · 14bdb65 · 14bdb65
2 parents ca5dfbc + dd688aa
commit 14bdb65
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -42,7 +42,7 @@ public ProxyTestController()
 
             //optionally set the Certificate Engine
             //Under Mono only BouncyCastle will be supported
-            //proxyServer.CertificateEngine = Network.CertificateEngine.BouncyCastle;
+            //proxyServer.CertificateEngine = Network.CertificateEngine.DefaultWindows;
 
             //optionally set the Root Certificate
             //proxyServer.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable);

diff --git a/Titanium.Web.Proxy/Network/CertificateManager.cs b/Titanium.Web.Proxy/Network/CertificateManager.cs
@@ -126,7 +126,7 @@ internal X509Certificate2 RootCertificate
         internal CertificateManager(Action<Exception> exceptionFunc)
         {
             this.exceptionFunc = exceptionFunc;
-            Engine = CertificateEngine.DefaultWindows;
+            Engine = CertificateEngine.BouncyCastle;
 
             certificateCache = new ConcurrentDictionary<string, CachedCertificate>();
         }

diff --git a/Titanium.Web.Proxy/ProxyServer.cs b/Titanium.Web.Proxy/ProxyServer.cs
@@ -36,11 +36,6 @@ public partial class ProxyServer : IDisposable
         internal const string UriSchemeHttps = "https";
 #endif
 
-        /// <summary>
-        /// Enable the experimental ALPN adder streams
-        /// </summary>
-        internal static bool AlpnEnabled = false;
-
         /// <summary>
         /// Is the proxy currently running
         /// </summary>

diff --git a/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj b/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
@@ -46,8 +46,8 @@
     <AssemblyOriginatorKeyFile>StrongNameKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
-      <HintPath>..\packages\BouncyCastle.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto">
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.1.2\lib\net4\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="StreamExtended, Version=1.0.1.0, Culture=neutral, PublicKeyToken=bbfa0f1d54f50043, processorArchitecture=MSIL">

diff --git a/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec b/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
@@ -3,9 +3,9 @@
   <metadata>
     <id>Titanium.Web.Proxy</id>
     <version>$version$</version>
-    <title>Titanium web proxy</title>
-    <authors>Titanium</authors>
-    <owners>Titanium</owners>
+    <title>Titanium Web Proxy</title>
+    <authors>Titanium Web Proxy GitHub Contributors</authors>
+    <owners>justcoding121</owners>
     <licenseUrl>https://github.com/justcoding121/Titanium-Web-Proxy/blob/develop/LICENSE</licenseUrl>
     <projectUrl>https://github.com/justcoding121/Titanium-Web-Proxy</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -14,14 +14,8 @@
     <copyright>Copyright &#x00A9; Titanium.  All rights reserved.</copyright>
     <tags></tags>
 	 <dependencies>
-	  <group targetFramework="net45">
 	    <dependency id="StreamExtended" version="1.0.18" />
-        <dependency id="BouncyCastle" version="1.8.1" />
-	  </group>
-      <group targetFramework="netstandard1.6">
-	   <dependency id="StreamExtended" version="1.0.18" />
-	   <dependency id="Portable.BouncyCastle" version="1.8.1.2" />
-      </group>	
+        <dependency id="Portable.BouncyCastle" version="1.8.1.2" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Titanium.Web.Proxy/packages.config b/Titanium.Web.Proxy/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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" />
 </packages>