From c3583e182ca6585e40d1eef0da8c18547c0b1bc1 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 21 Jan 2024 20:48:15 -0500 Subject: [PATCH] Stop shipping the OpenSSL 1.0.x native CentOS 7 is end of life in June 2024. Let's cut this loose. I'll also recompiling all the natives soon. --- .../velocitypowered/natives/util/Natives.java | 3 --- .../linux_x86_64/velocity-cipher-ossl10x.so | Bin 8640 -> 0 bytes 2 files changed, 3 deletions(-) delete mode 100755 native/src/main/resources/linux_x86_64/velocity-cipher-ossl10x.so diff --git a/native/src/main/java/com/velocitypowered/natives/util/Natives.java b/native/src/main/java/com/velocitypowered/natives/util/Natives.java index d33ce985d..6dd204abe 100644 --- a/native/src/main/java/com/velocitypowered/natives/util/Natives.java +++ b/native/src/main/java/com/velocitypowered/natives/util/Natives.java @@ -108,9 +108,6 @@ public class Natives { new NativeCodeLoader.Variant<>(NativeConstraints.LINUX_X86_64, copyAndLoadNative("/linux_x86_64/velocity-cipher-ossl11x.so"), // Debian 9 "OpenSSL 1.1.x (Linux x86_64)", NativeVelocityCipher.FACTORY), - new NativeCodeLoader.Variant<>(NativeConstraints.LINUX_X86_64, - copyAndLoadNative("/linux_x86_64/velocity-cipher-ossl10x.so"), // CentOS 7 - "OpenSSL 1.0.x (Linux x86_64)", NativeVelocityCipher.FACTORY), new NativeCodeLoader.Variant<>(NativeConstraints.LINUX_AARCH64, copyAndLoadNative("/linux_aarch64/velocity-cipher.so"), diff --git a/native/src/main/resources/linux_x86_64/velocity-cipher-ossl10x.so b/native/src/main/resources/linux_x86_64/velocity-cipher-ossl10x.so deleted file mode 100755 index 828c5757bdba5a8b97c3d661c386cfadccc5b745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8640 zcmeHMeQaA-6~B)2wKj81w{BTm(Wj~#>7;o{+l0bYX6K`M>5_h=$>`{^SI2%yTsd~I zU(%$SpeUuPmj$wkKM>-N3JI8ogbEUqHincg-Kf}rGB#ErU|CT`(sf(56_hcU`JMaj zah{(Ym{i1HTA*MoT5}-QD@yy>SSx`-8m=2fN_?V)sM=a@8`t0&bpC&U*FQ}$4 zRm~8kkfP_jDtFV((uxpFNtV*S%T|=~r&mk1fNr;8!Ibs(Ly!FYxXG^syHtHE^-GQF z52mU)vTZlRh8IuUo*vP8>iLD!-@N&O;ht-eOI_dFu>U7rzoaUtoSMS@f9kAOAx^Yx zA&k28COoGeKJ}Gn{`~mE&8@FqefG&8UcLCmgB!k3zN#^C@0qJlPrd7V^SAG)-iNR& zy#juX3nTXI3OM~C9qx;pc3JTfBQh2y1L1h=7zB5Z8ePglb3B|*n`vPUrjkcn z$0Fvi6-y?>?(k^Xh$M%MQ8S*5#H{h*R3b6rc|GUx z98}|SQLXok3xx|_&qRm{E`D_SIAC{ znx`~vRFer7ngh4{QNp6ufjj-IbKuVXa)$#~TZ}Xmbl}b@t2=O~pZgrRb1Lf-S1a|& zvbQQUp?`J8Dx1Ft=Jknlm9w_L*@luzO=NE`#k+cA5IN!psc>N~i*)_V##;3q<0n#*-nLM$a}rnIr10skJ<8%IONYRdG*Y5`q?Y@>YfYw zZ?s<`?|D0W3B6f{g!slV2dgF1DU$_tX zW%X%P_v!&X^P&BnDzf|PsCBpLlQ-#^*Wsl;xqFyCm!7$Ds5kq@H02NV&h~Ttq5JjB z??OGH?oj3>hb_N8S&^MSh;E-)@>_T6Q)|8Wg!)v&gG4f~&v$>6&DLjO&97&c4)ul} z4E2T{n(d#SUyTB|(4KkTO6!x}`j^`?b5GMQp=aKPVs<)Mj{GG07kQi=M1A(e%*a#o zv;WLyJ2LOIRzG!4&%B{$F2VWvKLMOr@&LEKG5;TGFVbIyHFg#?sIoMoEW%!?})XxztbE_rp8-Ssboqd zvDu{4agDZ^nB2}-3Eom#)@_f+&4F+{lo}WrG85MF=C&-CHX|b`>~43rnF%u$jvr9G zL)Nq2dk>v0@g>FKe`K@!KI|qKU9&_ys9!BobQYxKIo2gSV}8&2s*1{K zlx+sK0Z%1tO_PAnzspy%yL$D}%H!hRb@$x4ZSy9Asm>NWhf$Y2(}aBflO-*_nh9^4 zPkV5cucpQ45BVyaR|7*CvZN+;9tItRo;-Ur`TSoiY4z1id7FINqopmr+LL81zPgF> zHec|_DqkIdkWXv!)j+U`>`60%{6B}sk2X5jX~O@2rxLh4^R)Q12UOjF|DRUq0p53W z`z*_;{Z$Q{+`i2`?fsOhY?3=a-pIV#Y;IFL@AvB!&)<%(kG${G7^KAIfBh&+M`^LB z>Z9>asixGXSaf9Cp*CCI~R4J+LFtplz+IZ>VeBx=pL?GNYOvwru>aZJ*iVuG`Ifg(r7! zcb3tKmB&jy?iD;v^6}E#c*@7i1b>%&yj<}2%*QJPkBfY~Qt7xw2dWhb{z zD?2BpeBpQbF7RUQqVqs8e5HQ)nY3Rm&hr8fp3;kWiuDhb6|?^u6%-k7SAcqoeMdM% zIQNfK$E!->h2!Toi5HHaO~8xAcUo4!=_aFbWe$3D1$=S^J3o+k;e7m�%p%*A#yI z2D?&@6M3;g6!T{z@S^QnLH;4&n;h-o?6DQ>d>c5$r`-Mjgp|iPSL+GKmEKnJhh6jW zeU?}4;&@XdHa35e?^_3a4JOMRZ?NoWBxR+ok^cTb1c8g)&0R)E`+;r*o|dCchBahF zDBhHYL^Np(#FKsDxDmCIsk9Lu850N?4aZH(j0PIFH8d0#l5s2}oJxhq5fiaeV_?# zw{!`ktz&OfsKeO1YuAC+ZlgQY)X_>x2&Ux>MAJ!QFr0`|SgqxOJ)zF_=7Q)|FzAi| z6^6VDW!z!CBC$AWCKnYeVnT)juP;O=17ohB-@gkkx|&AnMI58(*m862 zz*-TzjzHS=HJgKZG8}h(reu&)MfyY_Jw9ZG`#`OfO$RxLo30rcNQ?yfMq=^kU9qT; z++a98C<4*(1T<}GrRfwGht50iq*4aY4JkWK_Fa}0SoDgvpbj6DX- zK{b^IqtIo}*0AT4t-<*t5r~m0)dMTir|?iL0zZ5N2eefp2ctv?2g`h@S7ye~23 zd#f@d>*74oG#;mZt^!q&jIlTr{3_3s{;zTB^SP7h9`0C|9-BPj(&ztin5u1=#S8p@ zMCsH2VU+kD!IaLE&cyx4*xE#(tpsmtqJjSmwxWv zM2$k?dTg$ce+30JcDa7OU-AFr7u1L1erJ0;{{9GEr~iBpyGWgaRBMymoAsGqLWxs9 zcVAN#9L#Cj8P;R^CSc05|9l=jsPtKm&8X%uD;AL>tS*Px8P>ncg|ohs^4N8Xo>KMm s!a(Z)*