v1.2

AndroidKeyGen.cs

@@ -1,14 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Diagnostics;
 using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using static AndroidKeyGen.Program;
 

AndroidKeyGen.csproj

@@ -62,17 +62,12 @@
   <ItemGroup>
     <None Include=".editorconfig" />
     <None Include="app.manifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Portable.BouncyCastle">
-      <Version>1.9.0</Version>
-    </PackageReference>
+    <EmbeddedResource Include="Properties\res.gz" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AndroidKeyGen.resx">
       <DependentUpon>AndroidKeyGen.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="BouncyCastle.Crypto.dll" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -81,9 +76,14 @@
   <ItemGroup>
     <None Include="github-mark.png" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle.Cryptography">
+      <Version>2.4.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>cd "$(TargetDir)" &amp;&amp; del BouncyCastle.Crypto.dll
+    <PostBuildEvent>cd "$(TargetDir)" &amp;&amp; del BouncyCastle.Cryptography.dll
 
 lalaki_sign "$(TargetPath)"</PostBuildEvent>
   </PropertyGroup>

Program.cs

@@ -14,6 +14,7 @@
 using Org.BouncyCastle.Asn1.Nist;
 using System.Reflection;
 using System.Windows.Forms;
+using System.IO.Compression;
 
 namespace AndroidKeyGen
 {
@@ -23,14 +24,21 @@ internal static class Program
         private static void Main()
         {
             var main = Assembly.GetExecutingAssembly();
-            foreach (string resName in main.GetManifestResourceNames())
+            foreach (var resName in main.GetManifestResourceNames())
             {
-                Stream res = main.GetManifestResourceStream(resName);
-                if (resName.EndsWith(".dll"))
+                using (var res = main.GetManifestResourceStream(resName))
                 {
-                    var ms = new MemoryStream();
-                    res.CopyTo(ms);
-                    AppDomain.CurrentDomain.AssemblyResolve += (_, __) => Assembly.Load(ms.ToArray());
+                    if (resName.EndsWith(".gz"))
+                    {
+                        using (var gzDll = new GZipStream(res, CompressionMode.Decompress))
+                        {
+                            using (var ms = new MemoryStream())
+                            {
+                                gzDll.CopyTo(ms);
+                                AppDomain.CurrentDomain.AssemblyResolve += (_, __) => Assembly.Load(ms.ToArray());
+                            }
+                        }
+                    }
                 }
             }
             Application.EnableVisualStyles();