Update certificates (fix #66)

the1812 · Oct 24, 2024 · e8c1318 · e8c1318
1 parent e5f72ac
commit e8c1318
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 48 deletions.
diff --git a/mwp-ver.txt b/mwp-ver.txt
@@ -1 +1 @@
-2.17.1.0
+2.18.0.0
diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json
@@ -77,7 +77,8 @@
     "driveTheLife 256.2019.6.cer",
     "driveTheLife 2020.06.cer",
     "driveTheLife 256.2020.06.cer",
-    "driveTheLife 256.2023.08.cer"
+    "driveTheLife 256.2023.08.cer",
+    "driveTheLife 256.2024.10.cer"
   ],
   "Funshion": [
     "funshion.cer"
@@ -129,7 +130,9 @@
     "kingsoft 2022.01.cer",
     "kingsoft 256.2022.01.cer",
     "kingsoft 256.2022.07.cer",
-    "kingsoft 256.2024.06.cer"
+    "kingsoft 256.2024.06.cer",
+    "kingsoft 2024.10.cer",
+    "kingsoft 256.2024.10.cer"
   ],
   "Kugou": [
     "kugou.cer",
@@ -210,7 +213,8 @@
     "sogou 256.2019.10.cer",
     "sogou 2020.10.cer",
     "sogou 256.2020.10.cer",
-    "sogou 256.2021.10.cer"
+    "sogou 256.2021.10.cer",
+    "sogou 256.2024.10.cer"
   ],
   "Sohu": [
     "sohu.cer",
@@ -229,7 +233,8 @@
     "tencent 256.2020.02.cer",
     "tencent 2021.02.cer",
     "tencent 256.2021.02.cer",
-    "tencent 256.2024.02.cer"
+    "tencent 256.2024.02.cer",
+    "tencent 256.2024.10.cer"
   ],
   "Thunder": [
     "thunder.cer",

diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json
@@ -12,7 +12,7 @@
     "match": [
       {
         "url": "https://sd.360.cn/download_center.html",
-        "regex": "href=\"(https://wsdl.360safe.com/360sd/.+?.exe)",
+        "regex": "href=\"(https://.+?.360safe.com/360sd/.+?.exe)",
         "group": 1
       }
     ]
@@ -67,16 +67,6 @@
     ],
     "match": []
   },
-  "HeiNote": {
-    "fixed": [],
-    "match": [
-      {
-        "url": "http://heinote.7654.com/#firstPage",
-        "regex": "href=\"(http://d.heinote.com/downloads/.+.exe)\"",
-        "group": 1
-      }
-    ]
-  },
   "Higeshi": {
     "fixed": [],
     "match": [
@@ -151,16 +141,6 @@
       }
     ]
   },
-  "Ruanmei": {
-    "fixed": [],
-    "match": [
-      {
-        "url": "https://mofang.ruanmei.com/",
-        "regex": "href=\"(http[s]?://dl.ruanmei.com/pcmaster/.*?)\"",
-        "group": 1
-      }
-    ]
-  },
   "Shaji": {
     "fixed": [ "https://softdl.ahhxwavi.cn/pc/pdfconvert/PDFConverter_guanwang-1.exe" ],
     "match": []
@@ -174,8 +154,8 @@
         "group": 0
       },
       {
-        "url": "https://ie.sogou.com/",
-        "regex": "nav=\"download\".*href=\"(.*?)\"",
+        "url": "https://sogou.browser.qq.com/",
+        "regex": "href=\"([^\"]*?SogouExplorer_Setup[^\"]*?)\"",
         "group": 1
       }
     ]
@@ -184,8 +164,8 @@
     "fixed": [],
     "match": [
       {
-        "url": "https://tv.sohu.com/app/?x=4",
-        "regex": "href=\"(.*?)\".*btn-dwn",
+        "url": "https://tv.sohu.com/down/index.shtml?downLoad=win",
+        "regex": "href=\"(.*?)\".*donwbtn",
         "group": 1
       }
     ]
@@ -199,11 +179,6 @@
   "Tencent": {
     "fixed": [],
     "match": [
-      {
-        "url": "https://cdn-go.cn/qq-web/im.qq.com_new/latest/rainbow/windowsDownloadUrl.js",
-        "regex": "ntDownloadX64Url\":\\s*\"(.+)\",",
-        "group": 1
-      },
       {
         "url": "https://office.qq.com/download.html",
         "regex": "href=\"(.*?)\".*tim.downloads.windows",
@@ -242,15 +217,5 @@
         "group": 1
       }
     ]
-  },
-  "YY": {
-    "fixed": [],
-    "match": [
-      {
-        "url": "https://www.yy.com/web/pcyy_download/",
-        "regex": "window\\.location\\.href=\"(.*?)\"",
-        "group": 1
-      }
-    ]
   }
 }
diff --git a/src/MalwarePatch/Certificates/driveTheLife 256.2024.10.cer b/src/MalwarePatch/Certificates/driveTheLife 256.2024.10.cer
diff --git a/src/MalwarePatch/Certificates/kingsoft 2024.10.cer b/src/MalwarePatch/Certificates/kingsoft 2024.10.cer
diff --git a/src/MalwarePatch/Certificates/kingsoft 256.2024.10.cer b/src/MalwarePatch/Certificates/kingsoft 256.2024.10.cer
diff --git a/src/MalwarePatch/Certificates/sogou 256.2024.10.cer b/src/MalwarePatch/Certificates/sogou 256.2024.10.cer
diff --git a/src/MalwarePatch/Certificates/tencent 256.2024.10.cer b/src/MalwarePatch/Certificates/tencent 256.2024.10.cer
diff --git a/src/MalwarePatch/Languages/MainLanguage.cs b/src/MalwarePatch/Languages/MainLanguage.cs
@@ -35,7 +35,7 @@ public enum Keys
       AllowProgramDescription,
     }
     internal static DateTime LastModifiedTime => File.GetLastWriteTime(Process.GetCurrentProcess().MainModule.FileName);
-    internal const int UpdateMonth = 6;
+    internal const int UpdateMonth = 10;
     internal static string UpdateTime
     {
       get

diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.17.1.0")]
-[assembly: AssemblyFileVersion("2.17.1.0")]
+[assembly: AssemblyVersion("2.18.0.0")]
+[assembly: AssemblyFileVersion("2.18.0.0")]