diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-05-28 11:04:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-28 11:04:33 -0400 |
| commit | 1b52e95028e0d84b7a112e4b8f2e393261dbb19c (patch) | |
| tree | 3dba31b96e31d4c9816a2f124afc5ff2152af2c8 /src/trunnel/include.am | |
| parent | 0989ba33834c17b2eac3bb87596fca115965ce3c (diff) | |
| parent | 5eb584e2e91bd5d6d204b9bb62a95c0edf43ff71 (diff) | |
| download | tor-1b52e95028e0d84b7a112e4b8f2e393261dbb19c.tar.gz tor-1b52e95028e0d84b7a112e4b8f2e393261dbb19c.zip | |
Merge branch '12498_ed25519_keys_v6'
Fixed numerous conflicts, and ported code to use new base64 api.
Diffstat (limited to 'src/trunnel/include.am')
| -rw-r--r-- | src/trunnel/include.am | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/trunnel/include.am b/src/trunnel/include.am index 54e3db287e..9bf37fe58b 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -9,15 +9,24 @@ endif AM_CPPFLAGS += -I$(srcdir)/src/ext/trunnel -I$(srcdir)/src/trunnel +TRUNNELINPUTS = \ + src/trunnel/ed25519_cert.trunnel \ + src/trunnel/link_handshake.trunnel \ + src/trunnel/pwbox.trunnel + TRUNNELSOURCES = \ - src/ext/trunnel/trunnel.c \ - src/trunnel/pwbox.c + src/ext/trunnel/trunnel.c \ + src/trunnel/ed25519_cert.c \ + src/trunnel/link_handshake.c \ + src/trunnel/pwbox.c TRUNNELHEADERS = \ - src/ext/trunnel/trunnel.h \ - src/ext/trunnel/trunnel-impl.h \ - src/trunnel/trunnel-local.h \ - src/trunnel/pwbox.h + src/ext/trunnel/trunnel.h \ + src/ext/trunnel/trunnel-impl.h \ + src/trunnel/trunnel-local.h \ + src/trunnel/ed25519_cert.h \ + src/trunnel/link_handshake.h \ + src/trunnel/pwbox.h src_trunnel_libor_trunnel_a_SOURCES = $(TRUNNELSOURCES) src_trunnel_libor_trunnel_a_CPPFLAGS = -DTRUNNEL_LOCAL_H $(AM_CPPFLAGS) |