summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-24 10:51:39 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-25 11:58:14 -0400
commit3b7d0ed08e13d5b806b86818acec00c9352cf1c5 (patch)
treea4ca9a417606f09db1c6b4d62ebefe2331cd5875 /src/test/include.am
parent301114940143b0d950b3a8dd69e2d6ee0bc6244d (diff)
downloadtor-3b7d0ed08e13d5b806b86818acec00c9352cf1c5.tar.gz
tor-3b7d0ed08e13d5b806b86818acec00c9352cf1c5.zip
Use trunnel for crypto_pwbox encoding/decoding.
This reduces the likelihood that I have made any exploitable errors in the encoding/decoding. This commit also imports the trunnel runtime source into Tor.
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index d5163aac2f..33a4d08f9a 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -59,7 +59,7 @@ src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@
src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
src/common/libor-crypto-testing.a $(LIBDONNA) \
- src/common/libor-event-testing.a \
+ src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@