2
0
Эх сурвалжийг харах

更新openssl库,解决部分系统下解密失败的问题。
完善解密失败的提示。

Suxue 1 жил өмнө
parent
commit
11df32451a

+ 1 - 1
Helpers/OpenSSLInterop.cs

@@ -7,7 +7,7 @@ namespace WechatPCMsgBakTool.Helpers
 {
     public class OpenSSLInterop
     {
-        private const string Lib = "libcrypto-1_1-x64";
+        private const string Lib = "libcrypto-1_1";
         internal static unsafe int HMAC_Init(out HMAC_CTX ctx, byte[] key, int key_len, IntPtr md)
         {
             return HMAC_InitNative(out ctx, key, key_len, md);

+ 2 - 2
Main.xaml.cs

@@ -80,9 +80,9 @@ namespace WechatPCMsgBakTool
                         WXWorkspace.SaveConfig(CurrentUserBakConfig);
                         LoadWorkspace();
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
-                        MessageBox.Show("解密过程出现错误,请检查是否秘钥是否正确,如果有多开微信,请确保当前微信是选择的用户");
+                        MessageBox.Show("解密过程出现错误:" + ex.Message);
                     }
                 }
             }

+ 9 - 0
SelectWechat.xaml.cs

@@ -40,6 +40,15 @@ namespace WechatPCMsgBakTool
             p.StartInfo.RedirectStandardOutput = true;
             p.Start();
             string i = p.StandardOutput.ReadToEnd();
+            if (i.Contains("SYSINTERNALS SOFTWARE LICENSE TERMS"))
+            {
+                MessageBox.Show("请先同意Handle64的使用协议,同意后关闭弹窗重新打开新增工作区即可");
+                Process p1 = new Process();
+                p1.StartInfo.FileName = "tools/handle64.exe";
+                p1.StartInfo.Arguments = "-p wechat.exe";
+                p1.Start();
+            }
+
             string[] lines = i.Split(new string[] { "\r\n" }, StringSplitOptions.None);
             bool hitFind = false;
             ProcessInfo processInfo = new ProcessInfo();

+ 5 - 4
WechatPCMsgBakTool.csproj

@@ -6,8 +6,9 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <AssemblyVersion>0.2.1.0</AssemblyVersion>
-    <FileVersion>0.2.1.0</FileVersion>
+    <AssemblyVersion>0.3.1.0</AssemblyVersion>
+    <FileVersion>0.3.1.0</FileVersion>
+    <Version>0.3.1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="libcrypto-1_1-x64.dll">
+    <None Update="libcrypto-1_1.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="libssl-1_1-x64.dll">
+    <None Update="libssl-1_1.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Tools\ffmpeg.exe">

BIN
libcrypto-1_1-x64.dll


BIN
libcrypto-1_1.dll


BIN
libssl-1_1-x64.dll


BIN
libssl-1_1.dll