netstandard bouncy castle was finally released => use this official package

honfika · honfika · commit d6b97c8adb0d · 2022-12-23T17:24:17.000+01:00
diff --git a/src/Titanium.Web.Proxy/Certificates/Makers/BCCertificateMaker.cs b/src/Titanium.Web.Proxy/Certificates/Makers/BCCertificateMaker.cs
@@ -158,20 +158,14 @@ private static X509Certificate2 GenerateCertificate(string? hostName,
     private static X509Certificate2 WithPrivateKey(X509Certificate certificate, AsymmetricKeyParameter privateKey)
     {
         const string password = "password";
-        Pkcs12Store store;
 
+        var builder = new Pkcs12StoreBuilder();
         if (RunTime.IsRunningOnMono)
         {
-            var builder = new Pkcs12StoreBuilder();
             builder.SetUseDerEncoding(true);
-            store = builder.Build();
-        }
-        else
-        {
-            store = new Pkcs12Store();
         }
 
-        var entry = new X509CertificateEntry(certificate);
+        var store = builder.Build(); var entry = new X509CertificateEntry(certificate);
         store.SetCertificateEntry(certificate.SubjectDN.ToString(), entry);
 
         store.SetKeyEntry(certificate.SubjectDN.ToString(), new AsymmetricKeyEntry(privateKey), new[] { entry });
diff --git a/src/Titanium.Web.Proxy/Certificates/Makers/BCCertificateMakerFast.cs b/src/Titanium.Web.Proxy/Certificates/Makers/BCCertificateMakerFast.cs
@@ -167,20 +167,14 @@ public AsymmetricCipherKeyPair GenerateKeyPair(int keyStrength = 2048)
     private static X509Certificate2 WithPrivateKey(X509Certificate certificate, AsymmetricKeyParameter privateKey)
     {
         const string password = "password";
-        Pkcs12Store store;
 
+        var builder = new Pkcs12StoreBuilder();
         if (RunTime.IsRunningOnMono)
         {
-            var builder = new Pkcs12StoreBuilder();
             builder.SetUseDerEncoding(true);
-            store = builder.Build();
-        }
-        else
-        {
-            store = new Pkcs12Store();
         }
 
-        var entry = new X509CertificateEntry(certificate);
+        var store = builder.Build(); var entry = new X509CertificateEntry(certificate);
         store.SetCertificateEntry(certificate.SubjectDN.ToString(), entry);
 
         store.SetKeyEntry(certificate.SubjectDN.ToString(), new AsymmetricKeyEntry(privateKey), new[] { entry });
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net451;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Titanium.Web.Proxy</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>True</SignAssembly>
@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="BrotliSharpLib" Version="0.3.3" />
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.8" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.1'">
