diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-24 10:51:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 11:58:14 -0400 |
| commit | 3b7d0ed08e13d5b806b86818acec00c9352cf1c5 (patch) | |
| tree | a4ca9a417606f09db1c6b4d62ebefe2331cd5875 /src/common/include.am | |
| parent | 301114940143b0d950b3a8dd69e2d6ee0bc6244d (diff) | |
| download | tor-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/common/include.am')
| -rw-r--r-- | src/common/include.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/include.am b/src/common/include.am index 83a3706489..d669cf473a 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -16,7 +16,7 @@ EXTRA_DIST+= \ src/common/Makefile.nmake #CFLAGS = -Wall -Wpointer-arith -O2 -AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common +AM_CPPFLAGS += -I$(srcdir)/src/common -Isrc/common -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel if USE_OPENBSD_MALLOC libor_extra_source=src/ext/OpenBSD_malloc_Linux.c @@ -69,6 +69,7 @@ LIBOR_A_SOURCES = \ src/common/util_process.c \ src/common/sandbox.c \ src/ext/csiphash.c \ + src/ext/trunnel/trunnel.c \ $(libor_extra_source) \ $(libor_mempool_source) @@ -80,6 +81,7 @@ LIBOR_CRYPTO_A_SOURCES = \ src/common/crypto_format.c \ src/common/torgzip.c \ src/common/tortls.c \ + src/trunnel/pwbox.c \ $(libcrypto_extra_source) LIBOR_EVENT_A_SOURCES = \ |