diff --git a/mwp-ver.txt b/mwp-ver.txt index e72e31a..3bf5a3b 100644 --- a/mwp-ver.txt +++ b/mwp-ver.txt @@ -1 +1 @@ -2.9.3.0 \ No newline at end of file +2.9.4.0 \ No newline at end of file diff --git a/mwp.exe b/mwp.exe index cfc98fb..4ad628e 100644 Binary files a/mwp.exe and b/mwp.exe differ diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json index a0e9fcc..3b09de9 100644 --- a/src/MalwarePatch/Assets/certificate-map.json +++ b/src/MalwarePatch/Assets/certificate-map.json @@ -61,7 +61,8 @@ "grid verse (format factory) 256.cer", "grid verse (format factory) 2018.12.cer", "grid verse (format factory) 2020.02.cer", - "grid verse (format factory) 256.2020.02.cer" + "grid verse (format factory) 256.2020.02.cer", + "grid verse (format factory) 256.2020.08.cer" ], "HeiNote": [ "7654 note.cer", diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json index a282d14..19d16c3 100644 --- a/src/MalwarePatch/Assets/malware-remote-info.json +++ b/src/MalwarePatch/Assets/malware-remote-info.json @@ -98,7 +98,7 @@ }, { "url": "https://www.liebao.cn/", - "regex": "href=\"(http[s]?://dl.liebao.cn/kb/KSbrowser.*?)\"", + "regex": "href=\"(http[s]?://dl.liebao.cn/.*KSbrowser.*\.exe)\"", "group": 1 }, { diff --git a/src/MalwarePatch/Certificates/grid verse (format factory) 256.2020.08.cer b/src/MalwarePatch/Certificates/grid verse (format factory) 256.2020.08.cer new file mode 100644 index 0000000..41d30ab Binary files /dev/null and b/src/MalwarePatch/Certificates/grid verse (format factory) 256.2020.08.cer differ diff --git a/src/MalwarePatch/CliTools/MalwareChecker.cs b/src/MalwarePatch/CliTools/MalwareChecker.cs index c1f0540..7ed7a42 100644 --- a/src/MalwarePatch/CliTools/MalwareChecker.cs +++ b/src/MalwarePatch/CliTools/MalwareChecker.cs @@ -26,7 +26,7 @@ public MalwareCheckException() : base() { } class MalwareChecker { private const string InfoPath = @"assets/malware-remote-info.json"; - private const string UserAgent = @"Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.81 Safari/537.36"; + private const string UserAgent = @"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36"; private readonly JsonObject infoObject; private readonly StringBuilder stringBuilder = new StringBuilder(); private readonly bool clean = false; diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs index 77d0bd8..875b0ec 100644 --- a/src/MalwarePatch/Properties/AssemblyInfo.cs +++ b/src/MalwarePatch/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.3.0")] -[assembly: AssemblyFileVersion("2.9.3.0")] +[assembly: AssemblyVersion("2.9.4.0")] +[assembly: AssemblyFileVersion("2.9.4.0")]