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
35,999 Commits 53 Branches 631 Tags
0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
Commit Graph

35999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 014345ed6a Resolve remaining merge conflicts in relay.c 
(My bad!)
 2021-06-10 09:55:35 -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 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 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 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 1956f63d6b Bump to 0.4.4.9 2021-06-07 13:30:18 -04:00
Nick Mathewson 6bcb0fb881 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-07 13:29:49 -04:00
Nick Mathewson ed7f4ad4a9 Bump to 0.3.5.15. 2021-06-07 13:29:35 -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
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 48dd87933d Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-07 10:41:33 -04:00
Nick Mathewson e2c1ac214c Reindent a few lines to fix a GCC warning. 
As of GCC 11.1.1, the compiler warns us about code like this:

     if (a)
         b;
         c;

and that's a good thing: we wouldn't want to "goto fail".  But we
had an instance if this in circuituse.c, which was making our
compilation sad.

Fixes bug 40380; bugfix on 0.3.0.1-alpha.
 2021-05-07 10:39:20 -04:00
Nick Mathewson f68aeda549 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-07 09:53:57 -04:00
Nick Mathewson 621f8a304a Update geoip files to match ipfire location db, 2021/05/07. 2021-05-07 09:53:46 -04:00
Nick Mathewson 87d96f7162 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-21 10:34:14 -04:00
George Kadianakis 32eea3b006 Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5 2021-04-21 16:48:22 +03:00
David Goulet bba3393d20 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-14 08:39:16 -04:00
David Goulet 131e2d99a4 fallbackdir: Remove two unspec lines 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-04-14 08:39:04 -04:00
Nick Mathewson 5e6905ed99 Fix test naming, and fix tests on windows. 
This is a bugfix against my fix for #40133, which has not yet
appeared in 0.3.5.
 2021-04-13 17:38:31 -04:00
Nick Mathewson 59f6248e09 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-13 16:59:15 -04:00
David Goulet ee7c50b8a7 fallbackdir: Renegerate list with 200 relays 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-04-13 15:15:58 -04:00
Nick Mathewson b323e6b8c2 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-13 10:36:00 -04:00
Nick Mathewson 32f5ad7665 Update geoip files to match ipfire location db, 2021/04/13. 2021-04-13 10:35:50 -04:00
David Goulet 9ca2394d6b channel: Fix use after free in channel_do_open_actions() 
Fortunately, our tor_free() is setting the variable to NULL after so we were
in a situation where NULL was always used instead of the transport name.

This first appeared in 894ff2dc84 and results in
basically no bridge with a transport being able to use DoS defenses.

Fixes #40345

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-03-23 09:19:41 -04:00
Nick Mathewson 94fb308c5d Bump version to 0.4.4.8-dev 2021-03-16 09:17:56 -04:00
Nick Mathewson 5fac24053d Merge branch 'maint-0.3.5' into maint-0.4.4 
"ours" to avoid version bump.
 2021-03-16 09:17:40 -04:00
Nick Mathewson 3271c0bde7 Bump to 0.3.5.14-dev 2021-03-16 09:17:31 -04:00
Nick Mathewson f2cfd1ffad Remove check-best-practices from check-local in 0.4.4 2021-03-15 09:41:19 -04:00
Nick Mathewson 5ec579610a Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 09:01:59 -04:00
Nick Mathewson f078aab71e Merge branch 'bug40316_035_v2' into maint-0.3.5 2021-03-15 08:58:54 -04:00
Nick Mathewson 890ae4fb1a Fix detection of point to insert signatures on a pending consensus. 
We were looking for the first instance of "directory-signature "
when instead the correct behavior is to look for the first instance
of "directory-signature " at the start of a line.

Unfortunately, this can be exploited as to crash authorities while
they're voting.

Fixes #40316; bugfix on 0.2.2.4-alpha.  This is TROVE-2021-002,
also tracked as CVE-2021-28090.
 2021-03-15 08:56:58 -04:00
Nick Mathewson 2eb900f7e2 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 08:54:00 -04:00
Nick Mathewson efca9ce41c Clarify new intended strategy with TROVE-2021-001 
We're going to disable this feature in all versions for now.
 2021-03-15 08:53:36 -04:00
Nick Mathewson b9f6539008 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 08:52:28 -04:00
Nick Mathewson f46f4562cf Merge branch 'bug40286_disable_min_035' into maint-0.3.5 2021-03-15 08:41:03 -04:00
Nick Mathewson fb2c889a38 Bump to 0.4.4.8 2021-03-15 07:40:48 -04:00
Nick Mathewson 8ada4263a9 Merge branch 'maint-0.3.5' into maint-0.4.4 
"ours" to avoid version bump.
 2021-03-15 07:40:06 -04:00
Nick Mathewson 1a0b5fd569 Bump to 0.3.5.14 2021-03-15 07:39:45 -04:00
Nick Mathewson 9f59b6f458 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-12 11:36:34 -05:00
Nick Mathewson 02230575c4 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) 2021-03-12 11:36:28 -05:00
Nick Mathewson c1ce126c74 Use the right ticket number. 2021-03-12 11:31:36 -05:00
Nick Mathewson 41796158e6 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-12 11:30:21 -05:00