From c12e23ca9513d80a8cd539f52a6cacf432e0503c Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 29 May 2007 09:27:35 +0000 Subject: [PATCH] link to openssl libs --- encryption/msgfmt.pyc | Bin 4954 -> 5012 bytes encryption/setup.py | 4 ++-- encryption/src/deluge_core.cpp | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/encryption/msgfmt.pyc b/encryption/msgfmt.pyc index d0af62c0456b22cde987bf8949e66614d4a5bbfb..d228148561cb1801970671966c83d5ff1f590771 100644 GIT binary patch literal 5012 zcmb_g-EtdA6+S(Z^)r?nJNDX3cG*lNBvB~KCaHpe2|r7cO&JPjYn;U3tV>KZBYBe1 zj6B`4tu2WQvQNQla7}Sd70A6@=F*tV+eDuqKs73hPp7P}HQ*r8f>`i=?6ky(3boA_ZmkTZ^pYpBy6h zX_Q8JU?T5zoCf*W8$?A` zXu0Xd#)F)|)A3-KM7bxg0fdU3up5@-A)pjp2@tkJjSt@494#EylfB~6NQ`J zY}Q$vBwjz`iNRbNi}qNb@Io{Ato1t3=*oIMaZ#K?7rPD5y$cgXX3kCR0R3~cmV$cX=q-<~cZBJXY8 zGk8%Kfl2&u=OaA&M<_59D=Hg@oZVkf6lE)MTb;Kp}cr zb4C*4tOKILD|GSBVsq^E|;sJWV{0@aQQNx8d}T zXbR^ck{n^pKH9?F<*7r{5}kK>@bS?rnwAN^MZn?w;cWPoE9Ih6npGeco!`N5PsSAH zq6194@c<$xSZ`<8o)Vq3=>Wky#SH*PUl6Gh(rX*j3QZ~(`)y3C#QN2wtke0gSfj^B zJM=}FrY=nvY1*J^lO{EqEYif~)f;_>9$?9&P7{nYXi}Z^)#>E#bii}#v;m`W6mf;G z8(cKFV%R#-BWzIEywt4I+6Kn)?_G`6omw8H4>rtyI+ZTYMb) zHVTP7KQf~{l^E;K?kG^0@TiS6A2Z44n8H3N_-Ny06cS6jvHX$}I=;SI`#v;4jn%*e zj?p;&n9F(5s-x+1#0r?-MgTjD)LCu>^}%o$rJ*1?!R=s)ARl#&OdAH>w-UHPo(E$I zb(3iW_Uwyc{t8QGMM1+lGFk-1;cOF=+l~&Pz>=+@B1SX;h79X=8YH7gAZ5o2VQkiE z(O}BU?tv(Y68p;T+t&T}gDBpuIFudK^+Oc2&~RK;QLd^|rSwC!q}ElXyyh&UuTrYg zRkfx*#AscW@WoLVAz5ZP!wQgE*K1AuAo9xmCtT?ZB$OGPH3(yfG;j6Pwko#tV z*gfpPnppbZ+f_-O{G;fPml&m3mwgDq$SD`0AU4Mq4Z04c)4$4wJg+J9esNjbwQp)G z8sgMo5riy>kPEk@>0I0u5qE@kshGViv)LSMw<6;|na{t@Gh(A7Dn)bD-^Es z1X#VndY?RXB;)0=WjS1UwL!xR>&*&xUc|{HM}(s%>pA_ z<0!)E_8eMwcFW-hMWArhG>XPNYOwU+;=uop3k}T0xi@KiO~MqGtqYZ|GHpX^b&%ee zhwA#bg=!I<`>hQCYY+JoC{HpXz>AQz3MoqRh2&ZoRmkzC=1DgGbyv^>jC%m`MzVO*hpGEl0J|e6ar=icwgwD}`JhqT68_J9bEbQMdW=Nhc950m2 zIXI`)mg`4`+oJ34W1;;0=f3y~*)Wf=WYNtRud#wUl9Wn(FAnza@?LymNt%f(6aTwt zy&p1X>j%NxsE4=yBMM@|b}FT1<$}Jz5~DqlwJs>4*yBoB(m=qKpq_Z>VdstT%i z)e_1ksGctZuJiaZ-b>DPr-5X(in58z0gtnR(WY8)FuzpCF4rKh%Nnp7__}+9N8i9n zjkhH^lej_v1LD^~fM9%(9SFUT8=*vBfO7yC1q#0fTp%(*s9LwD?j!^optT}H-@_2nKM+312&l)A^Ywr(n+jc8 za8(xYjkUljB+J2bfZS+!<3h?(v7SX<;YJ9+FrA)%Wb?XJ!gYk8#!UpyWIIl(>VRjp zR^cm)aLICyUuHWJt^7GB!8rR4(+pgjU)T>)!Fu~xa{#v6Jl(PaW2602GZfnGVllVo zUnF*ArkN$$mp^i~D3jrnZ~mz%-&L9;`8ocZ;SW}ZXZO3~0r}nl=)e4txMjcHM2*YZ zUF!ZH?JkXci&8B~?%2wHWU`?V1`rnodH+<9D6Hgj^!Zy{@ZN?wuG5)0pwqE*!I9bG zi6Q{fEE7SJ79{&Wh~pDzx7mkV~E^$l~S5TMU)@b^&6L^AV1 sBs$)Yo${6YaFB(gB>MR^NY$LMSHK~&KiFC+HQai=zFGf${iCM(50+~DvH$=8 literal 4954 zcmai2ZFAek5#9qSQlv>)ZbgrcO0UlQc>_N*g%?IZW4aCI{i(ZPQSN*p+BO(pwF{MQW_^Sm4oHp-tFGrV)wa42LEl=Km6yD-*#mD z=i&ELJjLHYB9X_SMxGmaY?Sfjv8PN)9+#9U%j2>#GxB&wA}pxLfk;@D2n)*c19WF4 znvox1ttL@LnYu((WzI=7t4u@UrbIP)=1F!=Ox%#yA|^Fr;J{9+PN)6?_v#PgG|odC z`%jZJ%#Zv*Tohq1_B){s`&rNL=Gnlv@u3}sec$F`TJ%GkWT_v;MJG>&-hXcQpr7z>$7JfL@{3cDhSw0%H3wzX$f3!<$ZJ7Dpq#wWQC#lWq;l!N>+uuxG zX{`;$i`IN!H^iQBH%@I5_WMV^J&64x9K?Qily=m~u%NI`D}$of9oUJFcl?9wRSYlh z_=)vlC-jSCFzm;V*_i$Bmc?6uODqa+}_z!ms9Kr_v`hC8jND2 z?&GiRTy=aq8`be-#Nk=pca=D*4lycV0`uv=X}8zk1o(H(!h z>Q&P3`@M_{!>Kiz_UTV_>KS6zdKwlGW!j&8&ULS<{^P{KP)AizIx*o;-Q4carRb-l)Qjc##p5yL25*Plco20>|Lb1Hzxh|)(21|GnGHi{2H^w6J0 zkstbLmbSa2@4rW8o~d~x8*3~|w7LKnE>6}!S+-j|xVo&G8YI=WxmCciAwYqVwzF9I z)fYQEpFQ|uM>TNdBvMa;Im`v;NT_rgw17d^XopdB7koi0jE5NCbjVY+hDW3ES9s-; z> zH}qAw zl%1D|&e$k&TC@9Q*dN6OQ{2r>>~rDE$$)^6-35+`^xaQ(&yDVl;Uyn+tU5XjJI}Q= z!aNU;)TYe}3pnnzv_zI+Bv>T5MskJZ0*Rjd2Dz&wKFKALRg$+!u9I8_Y2k6il^4C8 zypav?#it;y#u{GTR7~AerBeF9%$XHaDPQ#FA*+Z z3hMNk)<4Hn{0?u9^`JF#;%SS6yww+tG(=Hkbzl{0U{+G}FW?|v#Rw%6i9DN?>>40{ zR+5?|NJHc%Cd#O|87wnGa64KNi!#uuL>nMf&2GAmi)2oo)g`+r#-L)1otI=m%BT=r zB^)f$IT$plC*}{>548s4EZ>Thffy)qj!Sa5;-Sz}h$f zO48GTkNw^vL=ZD-@*4Pcb^|(2ZBKj@9NRZ2K#*KwJLeAhY(~T50A-@Uv%BqZq8Iyg&%r@#jx8E;9ZsizclNQasp~$$ck2` zbLZ9E9>(5e^}MbgyS1S6znZRJGz8Vp7yhxyGr=s z3uwsj^z`-`1yJD(PE^-$(!QRbVL+VD9M)|O9d6C3abiTv3bQ5Yda~kem7@!jL}Au6 zCWC3#Ky~;3hR|MDr<-zgNz)W3TM=UE+eCACZFbWe(^OsgsZ^b0=T3{2y^R(L1w?Go zmI^(oqM{oNGKEw{$D0Kg-Mph0tR*t*^}9dpkMgkZP?u7@iW9xniF{Z@{2{Amo~Y#~ z@9*houORsB9HDPM^wA?_xsR`eTgAq$s33$tjnVzZ8;W+Xp0-99k12 z*vGOpRn!9jyQYB~qld(t1Mrbmo~XW^rLkHALUKF|$4v%0P;}9U4pK9Kx#gXb$6?e@ zQouD2=Q#Sf_3#TiuH9O|Xa)>apb_AF5o_b4adUmjdyu;8AvsVEJ|})ovQF|b3HNh5e?*Sk1Z?}9OKao^+rh6% z2>NdVJT(U4^SF!O;?E#L07te}O7o@;h;N!}UJ2kn4{p&TxD)mP`k1{2DSvO{SujNU**p5;;vdt8FG4n1IK`RLVf193lE z*Uk-*)1D0_e;t5`8vvjRfbZdkD9LwnC0;QAAzUnM6>*LiRkO=g zttG_EReZr$dhl(wp((|WH!Y9xS69IVbUlmv{M6cS9~7*ncALu`N-)#g-xe&7c6*}C z(e!J?X=VkRs`lAW+CrVl@PRk|u+&ef;$5tKg#W4VCuhTV``z||1pWYMaQ2gMO~00Y z?A;mh8{VCn`3a|53)ozns$Oifq1AfU5QTZ~r81B@xPZh#f#Q~{D&kP^3lf%~);QMd zFP1AXpu6B_;5bVzOmpdk}Z&*F3}|Y2j+@9AcBr+ z3BA-33(~8~q@b4Y709xxf;P=8W-4rn=+huf(*1phBj~lnq1gxI9+2E5xka)~!dDvT ziHTkgl6ZvRA;{Py0U0Ls%Zy@YLsuzOs;1h|9ZrqwuD7A_=0U0U2|=p30#fm6=o|GP TPFX26>a|+!PVJAi%T4n?=zE=) diff --git a/encryption/setup.py b/encryption/setup.py index bdcdfcb63..00a148bc0 100644 --- a/encryption/setup.py +++ b/encryption/setup.py @@ -124,11 +124,11 @@ else: # Ubuntu possible. if boosttype == "nomt": librariestype = ['boost_filesystem', 'boost_date_time', - 'boost_thread', 'z', 'pthread'] + 'boost_thread', 'z', 'pthread', 'ssl'] print 'Libraries nomt' elif boosttype == "mt": librariestype = ['boost_filesystem-mt', 'boost_date_time-mt', - 'boost_thread-mt', 'z', 'pthread'] + 'boost_thread-mt', 'z', 'pthread', 'ssl'] print 'Libraries mt' deluge_core = Extension('deluge_core', diff --git a/encryption/src/deluge_core.cpp b/encryption/src/deluge_core.cpp index ff1cd7390..6bf8606a1 100644 --- a/encryption/src/deluge_core.cpp +++ b/encryption/src/deluge_core.cpp @@ -46,11 +46,6 @@ #include "libtorrent/extensions/metadata_transfer.hpp" #include "libtorrent/extensions/ut_pex.hpp" -extern "C" -{ -#include "openssl/sha.h" -#include "openssl/bn.h" -} using namespace boost::filesystem; using namespace libtorrent;