From d725b8fc7e6345406374d5ed36824a52d9f9ca9b Mon Sep 17 00:00:00 2001 From: the1812 Date: Fri, 8 Oct 2021 22:13:32 +0800 Subject: [PATCH] Merge shabake into riyue --- mwp.exe | Bin 3615744 -> 3615744 bytes mwp.pkg | Bin 3615744 -> 3615744 bytes src/MalwarePatch/Assets/certificate-map.json | 6 ++---- src/MalwarePatch/Assets/display-names.json | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mwp.exe b/mwp.exe index be2a7783205ce5905e322c0354c6aa878d8d0bf0..2742c18ff23ccbbbfc9e379434278452e3a85407 100644 GIT binary patch delta 3075 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 diff --git a/mwp.pkg b/mwp.pkg index be2a7783205ce5905e322c0354c6aa878d8d0bf0..2742c18ff23ccbbbfc9e379434278452e3a85407 100644 GIT binary patch delta 3075 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 diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json index cd852a7..2190e6c 100644 --- 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 index 60ab3b9..e2f351b 100644 --- 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",