From d73ef0b44b9aabe9ca6d7c88c3a317ec622cf702 Mon Sep 17 00:00:00 2001 From: the1812 Date: Sun, 3 Jul 2022 15:25:53 +0800 Subject: [PATCH] Update to v2.13.0.0 --- mwp.exe | Bin 3664896 -> 3675136 bytes mwp.pkg | Bin 3664896 -> 3675136 bytes src/MalwarePatch/Assets/certificate-map.json | 14 ++++++++++---- .../Assets/malware-remote-info.json | 6 +++--- ...rid verse (format factory) 256.2022.07.cer | Bin 0 -> 1652 bytes .../Certificates/kingsoft 256.2022.07.cer | Bin 0 -> 1360 bytes .../Certificates/pptv 2022.07.cer | Bin 0 -> 1219 bytes .../Certificates/pptv 256.2022.07.cer | Bin 0 -> 1219 bytes .../Certificates/rising 2022.07.cer | Bin 0 -> 1949 bytes .../Certificates/rising 256.2022.07.cer | Bin 0 -> 1949 bytes src/MalwarePatch/Languages/MainLanguage.cs | 2 +- src/MalwarePatch/Models/Updater.cs | 4 ++-- src/MalwarePatch/Properties/AssemblyInfo.cs | 4 ++-- 13 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer create mode 100644 src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer create mode 100644 src/MalwarePatch/Certificates/pptv 2022.07.cer create mode 100644 src/MalwarePatch/Certificates/pptv 256.2022.07.cer create mode 100644 src/MalwarePatch/Certificates/rising 2022.07.cer create mode 100644 src/MalwarePatch/Certificates/rising 256.2022.07.cer diff --git a/mwp.exe b/mwp.exe index 556db6a3536bf465d1c8afbb964023d55f3e6172..b31d667820869780789065e43878a89a7923adff 100644 GIT binary patch delta 12279 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 N@3bg3ULf9!{U5t^N`C+V delta 5561 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 E0)ZUWs{jB1 diff --git a/mwp.pkg b/mwp.pkg index 556db6a3536bf465d1c8afbb964023d55f3e6172..b31d667820869780789065e43878a89a7923adff 100644 GIT binary patch delta 12279 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 N@3bg3ULf9!{U5t^N`C+V delta 5561 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 E0)ZUWs{jB1 diff --git a/src/MalwarePatch/Assets/certificate-map.json b/src/MalwarePatch/Assets/certificate-map.json index 56b347b..53dc49b 100644 --- a/src/MalwarePatch/Assets/certificate-map.json +++ b/src/MalwarePatch/Assets/certificate-map.json @@ -79,7 +79,8 @@ "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.08.cer" + "grid verse (format factory) 256.2020.08.cer", + "grid verse (format factory) 256.2022.07.cer" ], "HeiNote": [ "7654 note.cer", @@ -117,7 +118,8 @@ "kingsoft browser 256.2021.06.cer", "kingsoft 256.2021.06.cer", "kingsoft 2022.01.cer", - "kingsoft 256.2022.01.cer" + "kingsoft 256.2022.01.cer", + "kingsoft 256.2022.07.cer" ], "Kugou": [ "kugou.cer", @@ -139,7 +141,9 @@ "pptv 2019.1.cer", "pptv 256.2019.1.cer", "pplive.cer", - "pplive 256.cer" + "pplive 256.cer", + "pptv 2022.07.cer", + "pptv 256.2022.07.cer" ], "iQIYI": [ "qiyi.cer", @@ -154,7 +158,9 @@ "rising 2018.9.cer", "rising 256.2018.9.cer", "rising 2019.8.cer", - "rising 256.2019.8.cer" + "rising 256.2019.8.cer", + "rising 2022.07.cer", + "rising 256.2022.07.cer" ], "Riyue": [ "riyue (at).cer", diff --git a/src/MalwarePatch/Assets/malware-remote-info.json b/src/MalwarePatch/Assets/malware-remote-info.json index 77d40fc..cfbeb91 100644 --- a/src/MalwarePatch/Assets/malware-remote-info.json +++ b/src/MalwarePatch/Assets/malware-remote-info.json @@ -68,7 +68,7 @@ "match": [ { "url": "http://heinote.7654.com/#firstPage", - "regex": "href=\"(http://d.heinoteft.com/downloads/.+.exe)\"", + "regex": "href=\"(http://d.heinote.com/downloads/.+.exe)\"", "group": 1 } ] @@ -77,7 +77,7 @@ "fixed": [], "match": [ { - "url": "http://heinote.7654.com/#firstPage", + "url": "https://www.hgs.cn", "regex": "href=\"(https://dl-next.aunbox.cn/channel?.+?)\"", "group": 1 } @@ -151,7 +151,7 @@ "fixed": [], "match": [ { - "url": "http://mofang.ruanmei.com/", + "url": "https://mofang.ruanmei.com/", "regex": "href=\"(http[s]?://d.ruanmei.com/pcmaster/.*?)\"", "group": 1 } diff --git a/src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer b/src/MalwarePatch/Certificates/grid verse (format factory) 256.2022.07.cer new file mode 100644 index 0000000000000000000000000000000000000000..4e5184bbe1fde5d9ff3e379ba5e1485976537eaf GIT binary patch literal 1652 zcmah}c{tR07@yzFZ^rd=8>Dr_su1%XH`&lQlCvF_C8TL;6oxTKRv1O($`LstTS8HC zb)h67M@^1aDaX1cA(lm{PnSdY1qa3v-YLOp;_^>EoOXLGQIE({~6GfA3h*Ch319(M+9qIOr0Dn1> zv7D8swTFqLsU7k=Mf)IpCfYWK%Kaz1~L-->gqsKU55yWdK%i! zYfy6yYJY)R&LATC-!F;)Ax>0oglFW=`Qf&|Z3|}r9PcIz4%_43CieEBA zWd7zx(r%8`of*A)ZX`B*Bs*sOLelW*>%)n+H-wn~69N{L|8+MYEDFPd5>ab>ESd#H zpt=k8HJB7xzBKQ8C#y4PI-mQ&DNVNMOrg4bTgG>OZhI^Tc1&RFYV&I{HJ(R13lPXk zg>a5vY|7ENSYB<1)XTN(jERCW2My!O;yP|gq zSSYW;?OM~>oAFeFgqke3c*lqC#2{%Y(=)9l`MdAJPi=g14#?zMruD#FiX(;}EuVYT ze41{d#>D++{9V37o?q89(#b4+8X=di( z_PHm;fmq{&&MvEEij#DhvS?r5(t~hXep8jQGq7$)$^&Q(QetlHJjbyjdXHXK zvFq8re0Dy;!U@)=cBE9rerymFlJZ`RAS?VaA3w)ZpG_KTi<7!%p{t{fOE+|{!1pLW zvmhTVF50b`wO~atlw2&J5(%X<$@sC z56}T|0|O{Z@!K)!6n|gU^`I2GH_-pb1s$cf?!ut@()~S|bVl%hJWpi+Sxy}aup|%< z7lTej-xoJa2ySYP8T!S58S9&v$pF$EfdDKHi&aejDcE>(sM{gpH+()@rq!rbwF6jj z%yO_PAOUV1?nndz!4S~FAajFS_M=vd;BEZ7PmG7x_@o2DSmSoPR=2J~2srv=xU0)(e(k(T#$eVH%DfuVe z_A_o@{eYyJX%{MOWv^H$drT7(bW65enwzj|jlM!?4P!j7E}bxo_NNraHI~^98mJgH z|8T>%=vejd$3SIsyp+QH40_^Zy|&K+kHe|Y{D{lv>dq-)@{{n6?TsDPd~5@k37bxt z_^gBufq$9wG=frKZ< zKby7VRS{7Pt2p09ph0o33a^jq+dGO@=v4SA4~HByICfDq6DZ`ogbKRYx&IVEw5X&P3Lc>2);HTi{ViPGSU%LNyN z`|7n?H)RLCaM+nK<()M$PKmX7Xj>^zl9_Cnn;W=y_~(vgl)K=-xvIDPrDlm&R3>HJ z^o$kh)ihj|bxdgAV0|PSpUsC^{ju#ykGz+f=AsC~l0EyAU7(iOW(!KL&9!$eJv#-r ewhqH$_;yw9xskUbkGGnPgw{@`&J^@Zwf_Y#{+j*( literal 0 HcmV?d00001 diff --git a/src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer b/src/MalwarePatch/Certificates/kingsoft 256.2022.07.cer new file mode 100644 index 0000000000000000000000000000000000000000..f3f67bc9efb54f51ba906bc25370a66c2467a6af GIT binary patch literal 1360 zcmXqLV)Zd-Vli33%*4pVB*0$XeN&K^q37CLkr?fZ_iq{SvT>844Kifvn&VW_L=>%mNx>Xl!5zai$hj zM8O*=JBCkG_9g-;g;rQV5ig(Mma>fOF*MHf4WsS%39jkr`e#j`2PZK=Btar2P zE}xnA$)^`S>N@IQ+*_W>f3jkZl>Xt^3w7J<7ri#yGEY-zxvOBixzH)GDCc#5xu&nG zd+;TrX4!?~90!a(t95O*>M$sAlo7AaeR`>^;YXs&m4K3cX=lI0^t|67;yLlx@u&bh z85@_W_tv!EDCVEuSitPSCvlaDnUR5UaTDVaV2B(rkO#(!tTKy)fmnk`)RCRlT3m~l zzA9usknmIYTWTp^gn=wb0UwJPi^!jN#XApsewph{%JJGD+H0frcfn(DJj?PkGX7^_ zVP;})04GLSRTdrtE;bHrHbz!fc4lUSa*!GFECmL62Br&)7Z|qbXOxr_Sn2C07v&hE zBu@R}j6@^dL`X{1O)l0=H`D_v!qjF$ls0dW#R@Dg22KWMY@7*g9*k{&bC?+oG!4{Y z&SPQ}lZLtmJ*Vh92Lu~%u(72#@-VV68Z@@R^e{5AR2Y;QsKEFJjBOH7GxC#*3s9V9 z;0IU5)aC^9cOob^7NaQChvi04W`yQNPZv;5gl0r%M_^Et81R7nBn%31CIbfKlnyK$ zfGM4kVX5yQ?PWV9UU;r^(Z6P4w03e_!*KyVQ}bnFUK<}PFgNg<-xE1LS7+VTuNMRF zU#pqPvH0=f%==zvW|m$!(t7WU_a)P0R9n4mDd U<1d>RvM#sPEd@S${wY2P0A&v6!2kdN literal 0 HcmV?d00001 diff --git a/src/MalwarePatch/Certificates/pptv 2022.07.cer b/src/MalwarePatch/Certificates/pptv 2022.07.cer new file mode 100644 index 0000000000000000000000000000000000000000..6e564fb61089b686da1302c7841dec3f28ce6c78 GIT binary patch literal 1219 zcmXqLV%cxd#Jqd~GZP~dlR&PHnC@4F3*l?I!xgQ#&8!S~**LY@JlekVGBR?rG8niU zavN~6F^96S2{SqS844QkgE(9~9HDucAw{LdC5Ea7${-=ZZu6i;uToJNi8$_%6eC zF&kO`ln^~%2 zbE`9_#XYPqR4rNWn~-@w``VGW5kFpsPm5~~Yj$zBJ8CSvfwlDQU#D+dmN!N1@RXS* z_Tj)DxqQuIdAx}Qo?qVaHTic<_{4Vf#icX74$s1LNW* z#yDVzL>b5fV?tJ$MZ!R=LF8}UiK;{8GGXnP*8N~V?vy26A@x8C3=H5pnc7sKI+Ih2N{W$m z7V8%kCnguC8|wjO4BSC3k!Nu*ursh(V70)a%?zq7Cnd4K2uYi>qoIL;p|O6DBQP_V z8UQ)^&OttA76t|;ddWpO$Y~ImAAxC*k-;p_s8xVldi}1Vzk>DW6CN{2t9P+F9(c)T z^d#IMe$%Q2=bJU<7*9>vEW3DN+~TU*!@a+GFC5;)D(h_bzv_nno@_B)(Q3wP#rY;rWLwtiR`cflxSht& z|L~aI^7hMzS06L@zM^db+ky?+{A<(XwdP!~UblGV8=HlR2PZR$KY#w}HOIV7;)}z+ nSzWf`e9$^&X;sxl=ZZu6i;uToJNi8$_%6eC zF&kO`ln^~%2 zbE`9_#XYPqR4rNWn~-@w``VGW5kFpsPm5~~Yj$zBJ8CSvfwlDQU#D+dmN!N1@RXS* z_Tj)DxqQuIdAx}Qo?qVaHTic<_{4Vf#icX74$s1LNW* z#yDVzL>b5fV?tJ$MZ!R=LF8}UiK;{8GGXnP*8N~V?vy26A@x8C3=H5pnc7sKI+Ih2N{W$m z7V8%kCnguC8|wjO4BSC3k!Nu*ursh(V70)a%?zq7Cnd4K2uYi>qoIL;p|O6DBQP_V z8UQ)^&OttA76t|;ddWpO$Y~ImAAxC*k-;p_s8xVldi}1Vzk>DW6CN{2t9P+F9(c)T z^d#IMe$%Q2=bJU<7*9>vEW3DN+~TU*!@a+GFC5;)D(h_bzv_nno@_B)(Q3wP#rY;rWLwtiR`cflxSht& z|L~aI^7hMzS06L@zM^db+ky?+{A<(XwdP!~UblGV8=HlR2PZR$KY#w}HOIV7;)}z+ nSzWf`e9$^&X;sxln(Ss~8bh9}P1Yty zo{dDYyX4poZO2yDT9PGQYr=M@EwhTAYTB7y_Niz8+h^bZ-tYUp-|y!Oq}t^`ij&kJ zFa*N}@GeA{cBDE_r(C5=X}wnsbny%9(W?G&UE0Tc|eHn^AA`gUzjOiCt!h8%#WAA#+clsG;UfF7Qv)b zfyZi$$)LNqQ!xslIAeZvXJAg!rBJ|X3KjfyV$@ex;6|ZPTwFa|Jz{{Q>b+e2LYxhN zo+c!LsO`(*KV@x(n$ma?~SR|XpN#mvPl0@p< zoE)(rL4wn~IYRtT=0FNtzTZ6vr-evieJ!}8IP|P9*GD%+ ze;^>nykok>-N${1?~54kMMKy2byV)7b@Wa6s_X|+vhy5WppA^6o8AV!Ct5G<6c#je z%ZmEltSjPlqaU09dPTJiZ5I|j^*`^Bm#<`hD!C&G4>Nl7z*=Y*W;({;)uxj(Jq(N) zKM&p;o?(m}yc)lwKoRXR?$1~i%y%lSYX9O9fS%zzmVt%UNC*q1_ zq=6kTCMd@?c@F2=U9M8bDXG2GZa!k9v}yQ#{Km^g=~okZIHrmI5gbF_T`TMKc{;kB zJlqiQ$bJbb;-U7lXQuio9VMmj3<$<`yOqk2_>lPN!ooQZJpFU%c*ve z$bD@nVz+j2`0}t`6Cj;j62Z2dd~OtVVn^9;9*&J2EjFZ00nMAs z+A@P_9o0INy%y6JZ#ODxUgTuStbAFJi1+O=(~i*EEZ*ant3u;@&YzzWZKw>oa`xGz z>H+VTmAxY)${hYdG;(WDXojU8*0V@#ZG{m?3py%=@#=|yfrWZf&8$#kU?g6`aT}d% zr_F9Rl)qNRdVOrxNO8lg*W*cL?(*4OM7d~|JT7vYeC8S&Qmuh}=#hoE;T zion`pK-8$OKo6Pl?QVKf^<(ZnZ-|WaY|5A z%u-YA#Nwrr=gFM|H;}5qc8=OPX#ZwbgRGiZC$)=zJEi^)PQ5j0W2hT&1ul4el4KEt zLSQAZoi7cBjF!!nk)56WVL-nyCXkfQYeEnz$p;b{u%4FyNNzl5%VTAxe_#w^|Ivcw zVe^fO({w2F14Z(G=#>C0(v(Hi{22_i-rp7KO{?A&kk$#;gMpWSj{W##<>`RMnTiqg z8xCjBn|5ze8MD;2WnJaMEWyp|&1(ybL%v#n`}>iZCx#rKD6gY|!G|thxK%=l4@!tx zV7A|`LL7Pbu+6C6qnuqHhq5MKp1K$*{Nl^?v%F6E%EG0_mk_U7#b>>B8_LtW4aED? z1k+>?+0C(9bv&j-kC$s$Yb`z9WGgPOPw8>ymtzCqYk!#Fl5DuSRaI;nZ0b2l%46@k zGj@7bn3#_oyt;UQKey`I;O9y^n5}FwjNdLZ`^D?j?zk0k6Z^i6sINZIA|vc;EH`22|wjU@n&G(;u*CMY@H_5deZTs}HinhIIh0SkUgM@ziedVmE^?{`o zgrK3`uMRwZaX}tK-nRM9K5iZTNNy~}2||mLyJFg6i#YYEPxiEWiW#>_Ckfit{h92J(e^}7aR+h)cP l=^XpGOzw3y!$zUw{l~VkdmS>>wd5S#YbD=A(eqf}{|R-W?|lFO literal 0 HcmV?d00001 diff --git a/src/MalwarePatch/Certificates/rising 256.2022.07.cer b/src/MalwarePatch/Certificates/rising 256.2022.07.cer new file mode 100644 index 0000000000000000000000000000000000000000..0dfd947d0c65cf23ce7b97550e649983042da809 GIT binary patch literal 1949 zcmb`Hc{tQ*9KijK8Iy7~Wl;DnLdd+v$T49DF_n8nNe5$?$uW!>n(Ss~8bh9}P1Yty zo{dDYyX4poZO2yDT9PGQYr=M@EwhTAYTB7y_Niz8+h^bZ-tYUp-|y!Oq}t^`ij&kJ zFa*N}@GeA{cBDE_r(C5=X}wnsbny%9(W?G&UE0Tc|eHn^AA`gUzjOiCt!h8%#WAA#+clsG;UfF7Qv)b zfyZi$$)LNqQ!xslIAeZvXJAg!rBJ|X3KjfyV$@ex;6|ZPTwFa|Jz{{Q>b+e2LYxhN zo+c!LsO`(*KV@x(n$ma?~SR|XpN#mvPl0@p< zoE)(rL4wn~IYRtT=0FNtzTZ6vr-evieJ!}8IP|P9*GD%+ ze;^>nykok>-N${1?~54kMMKy2byV)7b@Wa6s_X|+vhy5WppA^6o8AV!Ct5G<6c#je z%ZmEltSjPlqaU09dPTJiZ5I|j^*`^Bm#<`hD!C&G4>Nl7z*=Y*W;({;)uxj(Jq(N) zKM&p;o?(m}yc)lwKoRXR?$1~i%y%lSYX9O9fS%zzmVt%UNC*q1_ zq=6kTCMd@?c@F2=U9M8bDXG2GZa!k9v}yQ#{Km^g=~okZIHrmI5gbF_T`TMKc{;kB zJlqiQ$bJbb;-U7lXQuio9VMmj3<$<`yOqk2_>lPN!ooQZJpFU%c*ve z$bD@nVz+j2`0}t`6Cj;j62Z2dd~OtVVn^9;9*&J2EjFZ00nMAs z+A@P_9o0INy%y6JZ#ODxUgTuStbAFJi1+O=(~i*EEZ*ant3u;@&YzzWZKw>oa`xGz z>H+VTmAxY)${hYdG;(WDXojU8*0V@#ZG{m?3py%=@#=|yfrWZf&8$#kU?g6`aT}d% zr_F9Rl)qNRdVOrxNO8lg*W*cL?(*4OM7d~|JT7vYeC8S&Qmuh}=#hoE;T zion`pK-8$OKo6Pl?QVKf^<(ZnZ-|WaY|5A z%u-YA#Nwrr=gFM|H;}5qc8=OPX#ZwbgRGiZC$)=zJEi^)PQ5j0W2hT&1ul4el4KEt zLSQAZoi7cBjF!!nk)56WVL-nyCXkfQYeEnz$p;b{u%4FyNNzl5%VTAxe_#w^|Ivcw zVe^fO({w2F14Z(G=#>C0(v(Hi{22_i-rp7KO{?A&kk$#;gMpWSj{W##<>`RMnTiqg z8xCjBn|5ze8MD;2WnJaMEWyp|&1(ybL%v#n`}>iZCx#rKD6gY|!G|thxK%=l4@!tx zV7A|`LL7Pbu+6C6qnuqHhq5MKp1K$*{Nl^?v%F6E%EG0_mk_U7#b>>B8_LtW4aED? z1k+>?+0C(9bv&j-kC$s$Yb`z9WGgPOPw8>ymtzCqYk!#Fl5DuSRaI;nZ0b2l%46@k zGj@7bn3#_oyt;UQKey`I;O9y^n5}FwjNdLZ`^D?j?zk0k6Z^i6sINZIA|vc;EH`22|wjU@n&G(;u*CMY@H_5deZTs}HinhIIh0SkUgM@ziedVmE^?{`o zgrK3`uMRwZaX}tK-nRM9K5iZTNNy~}2||mLyJFg6i#YYEPxiEWiW#>_Ckfit{h92J(e^}7aR+h)cP l=^XpGOzw3y!$zUw{l~VkdmS>>wd5S#YbD=A(eqf}{|R-W?|lFO literal 0 HcmV?d00001 diff --git a/src/MalwarePatch/Languages/MainLanguage.cs b/src/MalwarePatch/Languages/MainLanguage.cs index 5cd91ee..0471471 100644 --- a/src/MalwarePatch/Languages/MainLanguage.cs +++ b/src/MalwarePatch/Languages/MainLanguage.cs @@ -34,7 +34,7 @@ public enum Keys AllowProgramDescription, } internal static DateTime LastModifiedTime => File.GetLastWriteTime(Process.GetCurrentProcess().MainModule.FileName); - internal const int UpdateMonth = 4; + internal const int UpdateMonth = 7; internal static string UpdateTime { get diff --git a/src/MalwarePatch/Models/Updater.cs b/src/MalwarePatch/Models/Updater.cs index bc81852..1910382 100644 --- a/src/MalwarePatch/Models/Updater.cs +++ b/src/MalwarePatch/Models/Updater.cs @@ -42,8 +42,8 @@ public Task DownloadUpdate() { File.Delete(UpdateFileName); } - var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg"; - // var downloadLink = "https://github.com/the1812/malware-patch/raw/master/mwp.exe"; + // var downloadLink = "https://cdn.jsdelivr.net/gh/the1812/Malware-Patch@master/mwp.pkg"; + var downloadLink = "https://github.com/the1812/malware-patch/raw/master/mwp.exe"; // var downloadLink = GoogleDrive.GetDirectLinkFromId(UpdateId); var info = new DownloadInfo(downloadLink) { diff --git a/src/MalwarePatch/Properties/AssemblyInfo.cs b/src/MalwarePatch/Properties/AssemblyInfo.cs index a6323b0..168c75c 100644 --- a/src/MalwarePatch/Properties/AssemblyInfo.cs +++ b/src/MalwarePatch/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.0.0")] -[assembly: AssemblyFileVersion("2.12.0.0")] +[assembly: AssemblyVersion("2.13.0.0")] +[assembly: AssemblyFileVersion("2.13.0.0")]