torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,780 Commits 53 Branches 631 Tags
6dba86d7c92d25b5a6eedd0dbd75dc466dcaa43a
Commit Graph
32780 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet 6dba86d7c9 Merge branch 'maint-0.4.1' 2019-07-29 12:02:54 -04:00
David Goulet 1d6054f750 Merge branch 'tor-github/pr/1179' into maint-0.4.1 2019-07-29 12:02:47 -04:00
Nick Mathewson 142612bd16 Merge branch 'maint-0.4.1' 
"ours" to avoid version bump.
 2019-07-25 21:52:02 -04:00
Nick Mathewson d8264ab62b bump to 0.4.1.4-rc-dev 2019-07-25 21:51:53 -04:00
Nick Mathewson eb021e8c6f forward-port the changelog for 0.4.1.4-rc 2019-07-25 21:44:17 -04:00
Nick Mathewson 2722296b95 Merge branch 'maint-0.4.1' 2019-07-25 20:11:47 -04:00
Nick Mathewson 278e65887b Fix more 32-bit errors with domain and tt_int_op 2019-07-25 20:11:33 -04:00
Nick Mathewson 69921a6a8a Merge branch 'maint-0.4.1' 2019-07-25 16:57:32 -04:00
Nick Mathewson 6095bbf74e test: Use a 64-bit comparison for logging domains. 2019-07-25 16:57:06 -04:00
David Goulet 57f955a38b practracker: Make it happing for circuitpadding.c 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-07-25 10:28:38 -04:00
David Goulet 044bb019b6 Merge branch 'maint-0.4.1' 2019-07-25 10:27:41 -04:00
George Kadianakis af26cd6101 Always check the retval of circpad_machine_current_state(). 2019-07-25 10:24:23 -04:00
George Kadianakis bd1ac408d8 Remove dead code from circpad_machine_remove_token(). 2019-07-25 10:24:19 -04:00
David Goulet cfb15d513d Merge branch 'maint-0.4.1' 2019-07-25 09:03:01 -04:00
David Goulet 2a4b156978 Merge branch 'tor-github/pr/1171' into maint-0.4.1 2019-07-25 09:02:53 -04:00
Nick Mathewson 7082cc1684 Merge branch 'maint-0.4.1' 
"ours" to avoid version bump.
 2019-07-25 09:01:20 -04:00
Nick Mathewson b2a6b52825 Bump version to 0.4.1.4-rc 2019-07-25 09:00:53 -04:00
Nick Mathewson 167d873bde Fix clang-detected errors related to log_domain_mask_t 2019-07-24 09:08:48 -04:00
George Kadianakis 2944b091fc Merge branch 'maint-0.4.1' 2019-07-24 12:32:06 +03:00
George Kadianakis bb33a2f290 Merge branch 'tor-github/pr/1181' into maint-0.4.1 2019-07-24 12:31:56 +03:00
George Kadianakis 91f04d006b Merge branch 'tor-github/pr/1165' 2019-07-24 12:29:57 +03:00
Nick Mathewson ab1f82ea2a Merge branch 'ticket24963_042_02' 2019-07-23 14:03:30 -04:00
Nick Mathewson df12ff3dea Add a test for disallowing single-hop introductions. 
Code from dgoulet.
 2019-07-23 12:42:33 -04:00
Nick Mathewson f14ce4bce6 Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1() 
This shouldn't be possible while Tor is running, but the tests can
hit this code.  Rather than force the tests to add a dummy channel
object, let's just tolerate their incompletely built circuits.
 2019-07-23 12:36:40 -04:00
Nick Mathewson ab1f39322c Merge remote-tracking branch 'tor-github/pr/1185' 2019-07-23 12:32:14 -04:00
Nick Mathewson f6db290e5a Merge remote-tracking branch 'tor-github/pr/1186' 2019-07-23 12:30:19 -04:00
David Goulet ef2dd1ba96 Merge branch 'tor-github/pr/1116' 2019-07-23 09:46:29 -04:00
David Goulet 2fce1274de Merge branch 'tor-github/pr/1153' 2019-07-23 09:43:36 -04:00
David Goulet f7dc920f4b Merge branch 'maint-0.4.1' 2019-07-23 09:39:51 -04:00
David Goulet c541258fac Merge branch 'tor-github/pr/1158' into maint-0.4.1 2019-07-23 09:39:43 -04:00
George Kadianakis fdfee3d06f Changes file for #31113. 2019-07-23 12:44:43 +03:00
pulls c2f6064325 Improve circpad documentation. 
Patch by Tobias Pulls.
 2019-07-23 12:44:43 +03:00
George Kadianakis aed82bf410 Add changes file for #31112 and #31098. 2019-07-23 11:52:25 +03:00
pulls fd1f285189 transition when we send our first padding packet, not on received 2019-07-23 11:52:25 +03:00
pulls 5f95b37f6c remove specified target_hopnum from relay-side machines (only for origin-side machines) 2019-07-23 11:52:25 +03:00
Nick Mathewson 5fb070a14d Extract the log_domain_t type to a lower-level header 
This way, both err and log may depend on it.
 2019-07-19 10:17:22 -04:00
Nick Mathewson f682de609b Adjust tor_log.rs for 64-bit log domains. 2019-07-19 10:07:32 -04:00
Nick Mathewson a9379d6750 Set 'routerlist' global to NULL before freeing it. 
There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls.  (ouch!)  This is a minimal fix
to try to resolve the issue without causing other problems.

Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().
 2019-07-19 09:49:52 -04:00
Nick Mathewson 8bbec36b3b Changes file for bug 31001 2019-07-19 09:21:45 -04:00
Tobias Stoeckmann 17458a87d7 Prevent UB on signed overflow. 
Overflowing a signed integer in C is an undefined behaviour.
It is possible to trigger this undefined behaviour in tor_asprintf on
Windows or systems lacking vasprintf.

On these systems, eiter _vscprintf or vsnprintf is called to retrieve
the required amount of bytes to hold the string. These functions can
return INT_MAX. The easiest way to recreate this is the use of a
specially crafted configuration file, e.g. containing the line:

FirewallPorts AAAAA<in total 2147483610 As>

This line triggers the needed tor_asprintf call which eventually
leads to an INT_MAX return value from _vscprintf or vsnprintf.

The needed byte for \0 is added to the result, triggering the
overflow and therefore the undefined behaviour.

Casting the value to size_t before addition fixes the behaviour.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
 2019-07-19 09:21:32 -04:00
Nick Mathewson 2e55fa9587 Adjust log callback type to use log_domain_mask_t 2019-07-08 14:11:02 -04:00
Nick Mathewson 4512578e49 Add a compile-time assertion to prevent a recurrence of 31080. 2019-07-08 13:41:35 -04:00
Nick Mathewson 09c692e72b Use a 64-bit mask for log domains, and fix a conflict 
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag.  We now need 64 bits for log domains in order to fix this
issue.

Fixes bug 31080; bugfix on 0.4.1.1-alpha.
 2019-07-08 13:32:45 -04:00
Nick Mathewson d972f29d8d Move declaration of LD_NO_MESG to make conflict more apparent. 2019-07-08 13:00:31 -04:00
George Kadianakis 5303dbe624 Merge branch 'tor-github/pr/1152' 2019-07-04 17:14:06 +03:00
Roger Dingledine 85473f9aaf typo fix 2019-07-03 16:01:05 -04:00
Roger Dingledine ebf1fc64fe clarify a comment in the tor-exit-notice text 
(a relay operator in #tor-relays just now was confused and thought
that dirportfrontpage could serve multiple files, like a real webserver.)
 2019-07-03 15:56:17 -04:00
Nick Mathewson 3e34840a77 Make config_lines_eq() take const arguments. 2019-07-03 10:27:38 -04:00
Nick Mathewson daed2e39ad Revert "Add a function to append an existing line to a config line list." 
This reverts commit 5a2ab886ba.
 2019-07-03 10:21:49 -04:00
Nick Mathewson e3ccf37e25 Fix @file directive in var_type_def_st.h 2019-07-03 10:19:57 -04:00