8505522e50
Avoid a use-after-null-check in proto_socks.c
...
Coverity rightly complains that early in the function we're checking
whether username is NULL, and later we're passing it unconditionally
to strlen().
Fixes CID 1437967. Bug not in any released Tor.
2018-07-16 07:51:11 -04:00
ef234ba303
Merge branch 'socks_trunnel4_squashed_merged'
2018-07-15 17:07:20 -04:00
f608cc0f31
Merge remote-tracking branch 'tor-github/pr/179'
2018-07-13 18:30:17 -04:00
b6c50c6259
Merge branch 'maint-0.3.4'
2018-07-12 14:32:16 -04:00
e0f33c1d3e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-12 14:32:16 -04:00
710188f84e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-12 14:32:16 -04:00
98ee23ca1e
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-12 14:32:16 -04:00
04512d9fcd
SOCKS: Always free username/password before setting them.
...
This fixes a memory leak found by fuzzing.
2018-07-12 14:20:56 -04:00
2d0e1cef20
Add fuzzing wrapper for fetch_from_buf_socks()
2018-07-12 14:20:46 -04:00
cd4795ca3e
put new bridge auth Serge into place
...
The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.
Closes ticket 26771.
2018-07-12 14:12:13 -04:00
7556933537
Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged
2018-07-12 11:47:25 -04:00
ba3121191b
Use constants for possible values of first octet
2018-07-12 11:41:44 -04:00
f27dc41627
Remove prop229 stuff from socks5.trunnel
2018-07-12 11:41:44 -04:00
4c845fcf9e
Rework socks_request_set_socks5_error() with trunnel
2018-07-12 11:41:44 -04:00
a6af21c1b7
Document new code
2018-07-12 11:41:44 -04:00
58cb2ed243
Fix buf_t advancement in fetch_buf_from_socks
...
We pullup 512 bytes of input to make sure that at least one SOCKS
message ends up in head of linked list
2018-07-12 11:41:44 -04:00
01cf3007b5
Make a distinction between truncated message and expecting more messages
2018-07-12 11:41:42 -04:00
fb105404f2
Fix whitespace/formatting
2018-07-12 11:41:20 -04:00
d2e54ff8a5
Remove legacy SOCKS5 phase 2 code
2018-07-12 11:41:05 -04:00
94706a427a
Add CMD_RESOLVE to socks5_client_request
2018-07-12 11:41:05 -04:00
bcbd3fb71e
Second phase of SOCKS5
2018-07-12 11:41:05 -04:00
57342b19f5
Remove legacy RFC1929 code
2018-07-12 11:41:05 -04:00
9068ac3cac
Implement SOCKS5 user/pass handling
2018-07-12 11:41:04 -04:00
75106a26b4
Fix type in socks5.trunnel
2018-07-12 11:40:49 -04:00
853d9b869d
Remove legacy SOCKS5 phase 1 code
2018-07-12 11:40:49 -04:00
63c478c1c4
Call new SOCKS code from parse_socks, to parse multiple packets in row
2018-07-12 11:40:49 -04:00
27333b2298
Reimplement phase 1 of SOCKS5 using trunnel
...
squash! Reimplement phase 1 of SOCKS5 using trunnel
2018-07-12 11:40:49 -04:00
c6a0b04d33
Remove legacy SOCKS4 code
2018-07-12 11:40:49 -04:00
b160929c22
Add RESOLVE (0xF0) command to socks4_client_request
2018-07-12 11:40:49 -04:00
9155e08450
Parsing SOCKS4/4a request using trunnel impl
2018-07-12 11:40:49 -04:00
0317eb143e
Remove a redundant typedef in proto_ext_or.h
2018-07-12 11:02:22 -04:00
4ac87a430f
Remove a redundant typedef in addr_policy_st.h
2018-07-12 10:35:29 -04:00
a7ec493d88
Merge remote-tracking branch 'imnotbad/bug26663'
2018-07-12 08:59:23 -04:00
5aee26ee46
Move all use cases of micro-revision.i to a single place
...
That place is git-revision.c; git-revision.c now lives in lib/log.
Also fix the compilation rules so that all object files that need
micro-revision.i depend on it.
2018-07-11 09:52:39 -04:00
537092cdbb
Merge branch 'ticket26223'
2018-07-10 20:18:28 -04:00
c90961a923
Document compat_getdelim_.
2018-07-10 20:18:20 -04:00
391ef5e42c
Explain why we use raw_free with getdelim result.
2018-07-10 20:16:37 -04:00
b6d0e7caa4
Rename tm_cvt to time_to_tm
2018-07-10 15:25:53 -04:00
e7f5f48d68
Rename torlog.[ch] to log.[ch]
...
Fun fact: these files used to be called log.[ch] until we ran into
conflicts with systems having a log.h file. But now that we always
include "lib/log/log.h", we should be fine.
2018-07-10 15:20:30 -04:00
41640b6573
Rename util_malloc to malloc.
2018-07-10 15:16:57 -04:00
6711a172c0
Merge remote-tracking branch 'neel/fbsd-cfix'
2018-07-10 14:50:49 -04:00
a2c44a7a7e
Isolate resolve.h usage in the modules that really need it.
...
(Almost none of Tor should actually need to touch the platform resolver.)
2018-07-10 13:36:45 -04:00
8de48c111c
Remove addr_port_lookup.
...
This lets us cut the dependency from address.c to resolve.c: the
address.c module now has no paths to the libc resolver in it.
2018-07-10 13:32:37 -04:00
2f657a1416
Remove all users of addr_port_lookup outside of address.c
...
This function has a nasty API, since whether or not it invokes the
resolver depends on whether one of its arguments is NULL. That's a
good way for accidents to happen.
This patch incidentally makes tor-resolve support socks hosts on
IPv6.
2018-07-10 13:23:37 -04:00
c2ddb7b231
Move tor_addr_{,port_}lookup to resolve.c
2018-07-10 13:00:02 -04:00
5d8336c182
Refactor ipv[46].[ch]
...
These are now combined into an inaddr.[ch], since their purpose is
to implement functions for struct in_addr and struct in6_addr.
The definitions for in6_addr and its allies are now in a separate
header, inaddr_st.h.
Closes ticket 26532.
2018-07-10 12:50:38 -04:00
6d58c20d94
Fix build on FreeBSD post-refactor
2018-07-10 12:32:14 -04:00
ef106ce788
Document the headers in src/app/config/
2018-07-10 12:28:31 -04:00
4f42c923d6
File-level summary documentation for src/lib/*/*.[ch]
2018-07-10 12:22:01 -04:00
951d59d706
Use tor_getline() in dirserv.c to remove its upper line limit.
...
Closes ticket 26223.
2018-07-10 10:36:49 -04:00
Nick Mathewson
Roger Dingledine
rl1987
Neel Chauhan