From 1c3229caa982c361fa0d83640e1bc0badb5719f6 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 1 Sep 2013 17:39:40 +0000
Subject: [PATCH] fix test_pe_crypto build

---
 Jamfile                  | 4 ++--
 test/test_pe_crypto.cpp  | 3 ++-
 test/test_primitives.cpp | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jamfile b/Jamfile
index 416a4f836..bc015ff99 100755
--- a/Jamfile
+++ b/Jamfile
@@ -448,8 +448,8 @@ lib boost_date_time : : <name>boost_date_time ;
 
 # openssl on linux/bsd/macos etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
-lib z : : <link>shared <name>z <search>/lib ;
-lib crypto : : <name>crypto <search>/lib <use>z ;
+lib z : : <link>shared <name>z <search>/usr/lib ;
+lib crypto : : <name>crypto <search>/usr/lib <use>z ;
 lib ssl : : <name>ssl <link>shared <use>crypto <search>/opt/local/lib ;
 lib dl : : <link>shared <name>dl ;
 
diff --git a/test/test_pe_crypto.cpp b/test/test_pe_crypto.cpp
index 70c159fe6..7ebf2a86b 100644
--- a/test/test_pe_crypto.cpp
+++ b/test/test_pe_crypto.cpp
@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/hasher.hpp"
 #include "libtorrent/pe_crypto.hpp"
 #include "libtorrent/session.hpp"
+#include "libtorrent/rsa.hpp"
 
 #include "setup_transfer.hpp"
 #include "test.hpp"
@@ -221,7 +222,7 @@ int test_main()
 	char public_key[268];
 	int public_len = sizeof(public_key);
 
-	ret = generate_rsa_keys(public_key, &public_len, private_key, &private_len, 2048);
+	int ret = generate_rsa_keys(public_key, &public_len, private_key, &private_len, 2048);
 	fprintf(stderr, "keysizes: pub: %d priv: %d\n", public_len, private_len);
 
 	TEST_CHECK(ret);
diff --git a/test/test_primitives.cpp b/test/test_primitives.cpp
index 8c1e3efb3..ba851019d 100644
--- a/test/test_primitives.cpp
+++ b/test/test_primitives.cpp
@@ -47,7 +47,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "libtorrent/enum_net.hpp"
 #include "libtorrent/bloom_filter.hpp"
 #include "libtorrent/aux_/session_impl.hpp"
-#include "libtorrent/rsa.hpp"
 #include "libtorrent/ip_voter.hpp"
 #include <boost/bind.hpp>
 #include <iostream>