Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#27620: Use trunnel to parse and generate SOCKS wire format in tor-resolve #325

Closed
wants to merge 10 commits into from
Closed

#27620: Use trunnel to parse and generate SOCKS wire format in tor-resolve #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0111dbb
tor-resolve: generate SOCKS4a request with trunnel
rl1987 Sep 11, 2018
82d961e
tor-resolve: link tor-resolve binary with trunnel lib
rl1987 Sep 11, 2018
85a01cc
tor-resolve: Use trunnel code for SOCKS5 request generation
rl1987 Sep 11, 2018
f84f4d9
Allow socks4_server_reply version to be 0 (for tor-resolve)
rl1987 Sep 12, 2018
16d7bd4
tor-resolve: parse SOCKS4a reply
rl1987 Sep 12, 2018
cca8fab
tor-resolve: Rework SOCKS5 method negotiation client part with trunnel
rl1987 Sep 12, 2018
5627ec1
tor-resolve: Rework SOCKS5 response parsing with trunnel
rl1987 Sep 12, 2018
5af3e5d
Fix coverage build
rl1987 Sep 13, 2018
27bc798
Add changes file
rl1987 Sep 13, 2018
3839060
fixup! tor-resolve: Rework SOCKS5 response parsing with trunnel
rl1987 Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changes/ticket27620
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
o Code simplification and refactoring:
- Rework SOCKS wire format handling to rely on trunnel-generated
parsing/generation code. Resolves ticket 27620.
7 changes: 6 additions & 1 deletion src/tools/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,23 @@ noinst_PROGRAMS+= src/tools/tor-cov-resolve
endif

src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c
src_tools_tor_resolve_LDFLAGS =
src_tools_tor_resolve_LDFLAGS = @TOR_LDFLAGS_openssl@
src_tools_tor_resolve_LDADD = \
src/trunnel/libor-trunnel.a \
$(TOR_UTIL_LIBS) \
$(TOR_CRYPTO_LIBS) $(TOR_LIBS_CRYPTLIB)\
$(rust_ldadd) \
@TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_USERENV@

if COVERAGE_ENABLED
src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c
src_tools_tor_cov_resolve_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
src_tools_tor_cov_resolve_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
src_tools_tor_cov_resolve_LDFLAGS = @TOR_LDFLAGS_openssl@
src_tools_tor_cov_resolve_LDADD = \
src/trunnel/libor-trunnel.a \
$(TOR_UTIL_TESTING_LIBS) \
$(TOR_CRYPTO_TESTING_LIBS) $(TOR_LIBS_CRYPTLIB) \
@TOR_LIB_MATH@ @TOR_LIB_WS32@
endif

Expand Down