June 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 31eaa81f59749ed7e9d4f1bad24225d23eb6f654 Merge: 7c19a4d924 d71bf986b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:42:15 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40391 | 9 +++++++++ src/core/or/circuitmux.c | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --cc src/core/or/circuitmux.c index b770e40bf2,e7309553c4..be54ae6ec6 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@@ -169,17 -216,21 +169,18 @@@ chanid_circid_entries_eq(chanid_circid_ static inline unsigned int chanid_circid_entry_hash(chanid_circid_muxinfo_t *a) { - return (((unsigned int)(a->circ_id) << 8) ^ - ((unsigned int)((a->chan_id >> 32) & 0xffffffff)) ^ - ((unsigned int)(a->chan_id & 0xffffffff))); + uint8_t data[8 + 4]; + set_uint64(data, a->chan_id); + set_uint32(data + 8, a->circ_id); + return (unsigned) siphash24g(data, sizeof(data)); } -/* Declare the struct chanid_circid_muxinfo_map type */ -HT_HEAD(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t); - /* Emit a bunch of hash table stuff */ HT_PROTOTYPE(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, - chanid_circid_entry_hash, chanid_circid_entries_eq) + chanid_circid_entry_hash, chanid_circid_entries_eq); HT_GENERATE2(chanid_circid_muxinfo_map, chanid_circid_muxinfo_t, node, chanid_circid_entry_hash, chanid_circid_entries_eq, 0.6, - tor_reallocarray_, tor_free_) + tor_reallocarray_, tor_free_); /* * Circuitmux alloc/free functions

1 0

[tor/maint-0.4.4] Resolve remaining merge conflicts in relay.c
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 014345ed6abca3305fcbdea3b75a23adc3976926 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 09:55:35 2021 -0400 Resolve remaining merge conflicts in relay.c (My bad!) --- src/core/or/relay.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 78fda99a45..892dbe2d0a 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -1735,17 +1735,9 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (!conn) { if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh->stream_id)) { -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { ->>>>>>> maint-0.3.5 + rh->stream_id)) { circuit_read_valid_data(ocirc, rh->length); log_info(domain, @@ -1954,20 +1946,10 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh->stream_id)) { - circuit_read_valid_data(ocirc, rh->length); -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); ->>>>>>> maint-0.3.5 + rh->stream_id)) { + circuit_read_valid_data(ocirc, rh->length); log_info(domain, "resolved cell on circ %u valid on half-closed " "stream id %d", ocirc->global_identifier, rh->stream_id);

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d Merge: 014345ed6a f57b5c48e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 12:30:11 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/bug40392 | 4 ++++ src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --cc src/feature/hs/hs_descriptor.c index 50a46fb40f,f74bb97ee2..c1e6553398 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@@ -133,10 -132,10 +133,10 @@@ static token_rule_t hs_desc_superencryp END_OF_TABLE }; -/* Descriptor ruleset for the encrypted section. */ +/** Descriptor ruleset for the encrypted section. */ static token_rule_t hs_desc_encrypted_v3_token_table[] = { T1_START(str_create2_formats, R3_CREATE2_FORMATS, CONCAT_ARGS, NO_OBJ), - T01(str_intro_auth_required, R3_INTRO_AUTH_REQUIRED, ARGS, NO_OBJ), + T01(str_intro_auth_required, R3_INTRO_AUTH_REQUIRED, GE(1), NO_OBJ), T01(str_single_onion, R3_SINGLE_ONION_SERVICE, ARGS, NO_OBJ), END_OF_TABLE };

1 0

[tor/main] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit a2e500f1ffd7978d05916060f9d9ff9496d734c0 Merge: 33e2c5962c cb38219664 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:21:49 2021 -0400 Merge branch 'maint-0.4.6' changes/geoip-2021-06-10 | 3 + src/config/geoip | 4764 +++++++++++++++++++++++++++------------------- src/config/geoip6 | 2826 ++++++++++++++++----------- 3 files changed, 4536 insertions(+), 3057 deletions(-)

1 0

[tor/main] Assert on _all_ failures from RAND_bytes().
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit c0aa9e0a1b1633d3b221199d516294e14a5db9c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 08:50:01 2021 -0400 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. --- changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket40390 b/changes/ticket40390 new file mode 100644 index 0000000000..b56fa4d9da --- /dev/null +++ b/changes/ticket40390 @@ -0,0 +1,8 @@ + o Major bugfixes (security, defense-in-depth): + - Detect a wider variety of failure conditions from the OpenSSL RNG + code. 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. diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 915fe0870d..206929d6b3 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -525,7 +525,7 @@ crypto_rand_unmocked(char *to, size_t n) /* We consider a PRNG failure non-survivable. Let's assert so that we get a * stack trace about where it happened. */ - tor_assert(r >= 0); + tor_assert(r == 1); #endif }

1 0

[tor/main] Merge branch 'bug40390_035_squashed' into maint-0.3.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 7fdfc2ea5470c572a113321e19cdb5144b10cdd8 Merge: 520d5c108f c0aa9e0a1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:34:25 2021 -0400 Merge branch 'bug40390_035_squashed' into maint-0.3.5 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.4
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 7c19a4d924120f42c224ea357b388b73d05c2d89 Merge: 57a41348ee 7fdfc2ea54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:37:26 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.4 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80 Merge: d60f8fe98a 7c19a4d924 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 1d11675adbc40c52b0d5047c0bb6f033bde6b19a Merge: cb38219664 e2d01aac9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 085bf61a351a6fce94046afe68a17eda0b133606 Merge: a2e500f1ff 1d11675adb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:37:34 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0