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 delta 3017 zcmcbmHbuRD^Cw;|rsvUa$qZ1y&cMLnz`(#zJd1&WA%%e}p81!>fQ!*3vi&GMf^oz^#^ixuEO4Czy zONtVc^-GFM^Ro3*^OB1y3raHc^Yn9z)6;TG^a?7$#+DW*rl+cdf{_DcCJQekJEI`u z=fFh)%C^4_N zqzEjUR$5h633eoypv0vhn-Wt}3_z>vuVVl$>QFw}z61WPRwLoG8yMKVazB{rI&mW82)ks*_rp@fB@hKZq> z5zJtLF_@u@5(b7E76!>?Mus%79AiyA6G$Y5i9y`FmWiQ;8Duj^2}FdMp-`70JcW^= zmX#re8xyq28-lcDe=LpVq=Cxdt` zBSQ%*Lna$2A*Zl|(k|Q~DLf1*ykKX5-Ic=0AR?Z^0aDV;0djW@D?YZPzd| zG&3<|a)3h9yq1-rhE)O-To5M6_fS@_2H#{^b`wU9$wBOv+L=E_glmjLxNj{*Yot~PP zT9jClY6VItHlVc5%EQFP$i~RU$j-pVY|6;TD8|UfBElrV$i~RV%+4UhD8g7T!N|qP z$;iye3?>B`c^G9Fxfr<^!C4oS_IO}v&zl*XUuu~^MNlm>xFmt3Kt@p6(#*(^&&9x4 z!vIQfdE8)D3NwQ^B>ANNT4G$<_6jC_Ax)m50Yj_wk zc|k>JGb6~CS*+jy0_7ME2AGD)wOkVQe4z9P3O@-3#u`pgZZfas1iOZZLB5uUA#X3l zFg{Rf2C1`0cA5yL)4--PfdT;JC_bUflLB>73AZ>Gsyk|NpXSnnAdVKfTTc?%*DWxA_7VtHQWqoOblX7o-8S% zuoM7F4m=F?=;@*G3`01`MrN>$ID)H02<&QJhDs@L0%T-J5d#+p!l1$jl&r$@l;DX_ z3|k_Ern|}IJXVUJ61xPHb-*=8d_hiWQDROID4S-2M1!~|U*d@p6M>f&Aeq#>l;ZNt zl8nivymnfky2jJrwWuh+D2NfH3{)!xfy$B~P_6`*DruQ{DM6f*Mfnu#)j&lKs1_|R z$}CCM04o8RnUp=5XeVC+#r`|g6slSSUGw5B_Oxu1SQHcFff2iF)%?%Q3mp2Zen(78mJhn z0~KSS;)-eVUcMALaYi;qUPeJCUPcjSP9|nXDMkTCa3u)}Ew0J7{HFEbYA`%cm4O9R zPcnmx3~+2QF))^Z8$_TwkO`@jU}mT&ht!q%3^7cg(hF4jvoNFxFl4bYfSLv%eH@^K z&sdnkz*xfq$`&9g6$Zu3aXw#1{J0- zgx4@K6euB#;R7dSsG0mAP6`7zD1p>miACv<#1Lc+i}w725^&l{EJ_aoRW{%#2NNjqu18v9ZL*tCbiF>vjcy=9 z6hw%F2u~0Js#1eMt^=q3AW(7-0=YQI59BIPN{^2RrStfButN|8ijxSr$N`kn5$(rf rkhwOw`6;D2sdiGJ^a!f$*_e13p^%AnwJp(;@T^r delta 2880 zcmbQDeoL)B_Y*Id#ldK|WCkc;Vqjo!U|?V8m% zzzk-FC}uE&g&~Rs%wT1RVr58SVu)g6$Y5YdWM@cWW=LUSXklcC;$TQ&WoThwh~i{O zVFNR`7*g07T7(%GqPQ7SIKVfDV!4*im);=1Z!|@+||V-;aAMez`$UrXIKJq zU^2*gAj~>Bk=c}yW%6`pe@3>+&zY6$LCSKA(@R(w7#LD3GD}KWL5$@5lvE9nh9EWu z28JMzqz1?!Fj1n+z`&rNk)NBYpPN{eU73`hq+eW?r=OCVQ<|QtpIe-smRq7%Pzg4w zv^X(6RUH&ETp$CO85nsP*%<{HlR*|UGfbYqq9gQNqAb!^I%k z%*c=iR>WAt0uo4JVh}g4Wnrjc1=$Qz0TE$kDAZ*LPhn)J<%FgRkrY<2$&3v3&5R5p z;7;4xUYPcC{m>D2qObmr*8NxwonHa=t85l~07&3)HNil_;AuELg zY%e3oYmg)>0;ND<01@V75D`z|0HxGs4v;5mI2lSr7&1i|Qo!NW%*2o>3JO~DT26)< zPEg3fSgZ_CR!yjG9W?}M1ajx0sB zg9vE`1_p3?0uzu#1xiTisd=eIi6yC4ptJ)j0vMPX7#SFOn7A0(7`YhP8Q7Rj8TslN z#TeOGB$xyk*%;ZF*%^cwMHnR*xfnSanHiZGIT_g*MHzV*Wf-{_xfsE@6_g}F#)Ffj zH#0cd)pCK#iCQLbIl%;q*-REtx@cx($me2UtYHAfZyq<8mBP#*UdsVWo+%6rSsVfk z`Em@5B^(TyoD7*<3^g2+*K&&2bAu8=Gb2ML4=569xf#Oq^ch%6_!zRd81j`F7#VBX z85m0h7%~MJSZdfAm^{5e93fD#)y&Ain8(Dx7?HvNN>3>)py*9uV_>OeWvFEV6=1c@ z3>9KbHQWp?v3yLmJfKvS!pLA=%M40(DJ%?1sjqn&5*(iO1=5^$Sx4UbOG2_E|5P#cJqM^LHIQ<4{jVk z$T+Y3SO&%#CYW*ouyT+ar5RELK??FM;TnWM`~pz1#{zLD3j^3P9*}c0WhVD?OV`VS zBL^%}z|O!}cm}MbL=L2+nGuw&LBYob4h@h=V6TFFTzCfAUmz(KkRDJ;1Cj#8r62=K ziU=qb)G#xoF)@fSd9tL4!Xg?J>pTqg=+Rzyh9MkeBP7Cb1XqbX*wwrYl~N2P+~9O5 z#sJFiil8C~lzPJRl;CMi3|m@*Ca=jWc&rq;KpCEgfq?;B;Kvu_loloC1cA!zOps_0 z-(+UqC{Iu}E&)|ro-W`5AUGr_2wYTva#C7mPHJ9aZfXgLlbV-OT%K8yQ39&pGV?%k z;0h+cv;@SST+C~i1gd{>GV@Z4!7`ryu0=)pMc}$Hh!IpGfGi3EDFVwErzV$V=H~^0 zTned+v_NhKmqU5^B_JI+LHr;gP`QPVGANaWqZFe6q=E!hq3o06_)Y8C7;2dq z!t+!aSU`0oE4ZWp#~upbpJqYX+P+AKDCoYg>LH?km2a<@72jznJcnxq{2_zf@HUq2*luW^?6k-P0 z287{YTR}!zft>>;Ajt}(&mNTCia|9i8xtoZ6f&_fu`%;-adL9%a7J=U^D+Ve>FdME 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;