Merge shabake into riyue

the1812 · Oct 8, 2021 · d725b8f · d725b8f
1 parent 215092a
commit d725b8f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/mwp.exe b/mwp.exe
diff --git a/mwp.pkg b/mwp.pkg
diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json
@@ -135,16 +135,14 @@
     "riyue (at).cer",
     "riyue (at) 256.cer",
     "xingcheng (at).cer",
-    "xingcheng (at) 256.cer"
+    "xingcheng (at) 256.cer",
+    "shabake 256.2021.10.cer"
   ],
   "Ruanmei": [
     "ruanmei.cer",
     "ruanmei 256.cer",
     "ruanmei 256.2019.1.cer"
   ],
-  "Shabake": [
-    "shabake 256.2021.10.cer"
-  ],
   "Sogou": [
     "sogou.cer",
     "sogou 256.cer",

diff --git a/src/MalwarePatch/Assets/display-names.json b/src/MalwarePatch/Assets/display-names.json
@@ -20,7 +20,6 @@
     "Rising": "Rising",
     "Riyue": "Adware",
     "Ruanmei": "Ruanmei",
-    "Shabake": "Shabake",
     "Sogou": "Sogou",
     "Sohu": "Sohu",
     "Taobao": "UC",
@@ -51,7 +50,6 @@
     "Rising": "瑞星",
     "Riyue": "广告下载器",
     "Ruanmei": "软媒",
-    "Shabake": "沙巴克",
     "Sogou": "搜狗",
     "Sohu": "搜狐",
     "Taobao": "UC",