Nick Mathewson
292865b894
Backport changelog entries
2021-06-10 13:14:11 -04:00
Nick Mathewson
7c07cf1afc
Merge branch 'maint-0.4.4' into release-0.4.4
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
096644038c
Merge branch 'maint-0.4.4' into release-0.4.4
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
15617f29cb
Merge branch 'maint-0.4.4' into release-0.4.4
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
aa4da024ad
Merge branch 'maint-0.4.4' into release-0.4.4
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
0e2d413d2e
Merge branch 'maint-0.4.4' into release-0.4.4
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
6378002d2d
remove rolled-up changes files.
2021-06-07 15:03:09 -04:00
Alexander Færøy
f66fa8eba5
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-25 13:25:23 +00: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
ef88ceedba
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-07 10:41:34 -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
49740f020d
Merge branch 'maint-0.4.4' into release-0.4.4
2021-05-07 09:53:57 -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
bb6362c06c
Merge branch 'maint-0.4.4' into release-0.4.4
2021-04-13 16:59:16 -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
f84ed7edaf
Merge branch 'maint-0.4.4' into release-0.4.4
2021-04-13 10:36:00 -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
Nick Mathewson
44df63e591
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-24 12:25:05 -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
ecdc6ac498
Changelog for 0.4.4.8.
2021-03-15 09:25:02 -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
ecf1ba9746
Merge branch 'maint-0.4.4' into release-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
b3c891119c
Merge branch 'maint-0.4.4' into release-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
4a538847a8
Merge branch 'maint-0.4.4' into release-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
1a407612bc
Merge branch 'maint-0.4.4' into release-0.4.4
2021-03-12 11:36:34 -05: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
c1ce126c74
Use the right ticket number.
2021-03-12 11:31:36 -05:00