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
37,432 Commits 53 Branches 631 Tags
8edd19ca728523bf6b4b4d0ef6e507eef740b604
Commit Graph

10062 Commits

Author SHA1 Message Date
Nick Mathewson 8edd19ca72 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-26 10:04:38 -04:00
Nick Mathewson 45c8d69cbb Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-26 10:04:38 -04:00
Alexander Færøy 83483bd4f6 Enable deterministic RNG for address set tests. 
This patch enables the deterministic RNG for address set tests,
including the tests which uses address set indirectly via the nodelist
API.

This should prevent random test failures in the highly unlikely case of
a false positive which was seen in tor#40419.

See: tpo/core/tor#40419.
 2021-06-25 16:43:10 +00:00
David Goulet 3abb9180cb Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-18 14:29:15 -04:00
Alexander Færøy 2c00ad36cd Fix compilation on systems with older compilers. 
This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
 2021-06-18 18:14:07 +00:00
Nick Mathewson 15b0980bd7 Fold entries into changelog and releasenotes 2021-06-10 13:13:29 -04:00
Nick Mathewson 8e590992c4 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 200e9a55e0 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 12:30:29 -04:00
Nick Mathewson 58ad0302ea Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 0ae9fd62fd Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 12:30:11 -04:00
George Kadianakis f57b5c48e0 Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing 2021-06-10 12:11:10 -04:00
Nick Mathewson 3260d323a6 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:53:07 -04:00
Nick Mathewson ec696a95e5 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 08:53:07 -04:00
Nick Mathewson a2b0d7ead4 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:53:07 -04:00
Nick Mathewson 0f2d45328d Merge branch 'maint-0.3.5' into maint-0.4.4 
Conflicts resolved:
	src/core/or/relay.c
 2021-06-10 08:52:39 -04:00
David Goulet adb248b6d6 TROVE-2021-003: Check layer_hint before half-closed end and resolve cells 
This issue was reported by Jann Horn part of Google's Project Zero.

Jann's one-sentence summary: entry/middle relays can spoof RELAY_END cells on
half-closed streams, which can lead to stream confusion between OP and
exit.

Fixes #40389
 2021-06-10 08:50:05 -04:00
Nick Mathewson 69bd4a8a2d Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:42:15 -04:00
Nick Mathewson 1da8621c0a Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 08:42:15 -04:00
Nick Mathewson f6ebe8b920 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:42:15 -04:00
Nick Mathewson 31eaa81f59 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 08:42:15 -04:00
Nick Mathewson d71bf986b4 Merge branch 'bug40391_035' into maint-0.3.5 2021-06-10 08:41:59 -04:00
Nick Mathewson 1d11675adb Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:37:34 -04:00
Nick Mathewson e2d01aac9e Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 08:37:34 -04:00
Nick Mathewson c58c2d4e37 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:37:34 -04:00
Nick Mathewson 7c19a4d924 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 08:37:26 -04:00
Nick Mathewson 7fdfc2ea54 Merge branch 'bug40390_035_squashed' into maint-0.3.5 2021-06-10 08:34:25 -04:00
Nick Mathewson c0aa9e0a1b Assert on _all_ failures from RAND_bytes(). 
Previously, we would detect errors from a missing RNG
implementation, but not failures from the RNG code itself.

Fortunately, it appears those failures do not happen in practice
when Tor is using OpenSSL's default RNG implementation.  Fixes bug
40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as
TROVE-2021-004. Reported by Jann Horn at Google's Project Zero.
 2021-06-10 08:33:57 -04:00
Nick Mathewson cb38219664 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:21:48 -04:00
Nick Mathewson d60f8fe98a Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 08:21:48 -04:00
Nick Mathewson 9e5e584cb6 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 08:21:48 -04:00
Nick Mathewson 57a41348ee Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 08:21:47 -04:00
Nick Mathewson 520d5c108f Update geoip files to match ipfire location db, 2021/06/10. 2021-06-10 08:20:13 -04:00
Nick Mathewson 009b5778b2 remove rolled-up changes file. 2021-06-07 15:03:27 -04:00
Nick Mathewson 9a37cf4883 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-01 12:16:42 -04:00
Nick Mathewson f832b4bcee Merge branch 'bug40175_045' into maint-0.4.6 2021-06-01 12:16:35 -04:00
Nick Mathewson 9348b1b440 changes file for #40175 2021-06-01 12:16:06 -04:00
Nick Mathewson a3c2dea3f6 Create an 0.4.6.4-rc changelog. 2021-05-28 08:00:47 -04:00
David Goulet e778f7065f Merge branch 'maint-0.4.6' into release-0.4.6 2021-05-27 10:01:49 -04:00
David Goulet fd3678fa60 Merge branch 'tor-gitlab/mr/392' into maint-0.4.6 2021-05-27 10:01:44 -04:00
Nick Mathewson d12b16614d Prefer mmap()ed consensus files over cached_dir_t entries. 
Cached_dir_t is a somewhat "legacy" kind of storage when used for
consensus documents, and it appears that there are cases when
changing our settings causes us to stop updating those entries.

This can cause trouble, as @arma found out in #40375, where he
changed his settings around, and consensus diff application got
messed up: consensus diffs were being _requested_ based on the
latest consensus, but were being (incorrectly) applied to a
consensus that was no longer the latest one.

This patch is a minimal fix for backporting purposes: it has Tor do
the same search when applying consensus diffs as we use to request
them.  This should be sufficient for correct behavior.

There's a similar case in GETINFO handling; I've fixed that too.

Fixes #40375; bugfix on 0.3.1.1-alpha.
 2021-05-26 13:02:56 -04:00
Alexander Færøy 11c7e65730 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-25 13:25:23 +00:00
Alexander Færøy 4a7379b80a Merge branch 'maint-0.4.4' into maint-0.4.5 2021-05-25 13:25:23 +00:00
Alexander Færøy 8efb9c29e9 Merge branch 'maint-0.4.6' into release-0.4.6 2021-05-25 13:25:23 +00:00
Alexander Færøy bab2b29f89 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-05-25 13:25:23 +00:00
Nick Mathewson 42ba87d964 Remove the function tor_tls_assert_renegotiation_unblocked. 
It was used nowhere outside its own unit tests, and it was causing
compilation issues with recent OpenSSL 3.0.0 alphas.

Closes ticket 40399.
 2021-05-25 07:38:31 -04:00
Nick Mathewson 4c06c619fa Use a more secure hash function for the circuitmux hashtable. 
Fixes bug 40931; bugfix on 0.2.4.4-alpha. Also tracked as
TROVE-2021-005.

This issue was reported by Jann Horn from Google's Project Zero.
 2021-05-18 08:40:09 -04:00
Nick Mathewson 6db1160f54 Merge branch 'maint-0.4.6' into release-0.4.6 2021-05-17 09:09:49 -04:00
Nick Mathewson debede5e50 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-05-17 09:09:49 -04:00
Nick Mathewson 97b61e21a9 Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5 2021-05-17 09:09:42 -04:00
Nick Mathewson 3630649b79 Merge branch 'maint-0.4.6' into release-0.4.6 2021-05-17 09:04:22 -04:00