July 2016 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782 Merge: b4bb886 9d3de77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:21:25 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 src/or/config.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit f54ffa463a5dd5ca41f253ce136d3e29b5e6aa20 Merge: e11cc95 f440874 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:23:25 2016 -0400 Merge branch 'maint-0.2.8' src/or/config.c | 5 ----- 1 file changed, 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 6e96aadadbe9ac49582c770e9ff11b3c2876abf3 Merge: 80089c9 c28ba99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:22:47 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --cc src/or/config.c index 3b35b5a,89b6087..0f36738 --- a/src/or/config.c +++ b/src/or/config.c @@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address return escaped(address); } +/** List of default directory authorities */ + +static const char *default_authorities[] = { + "moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", + "tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", + "dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "Tonga orport=443 bridge " + "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", + "maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with <b>type</b>. * Each authority's bits are restricted to the bits shared with <b>type</b>.

1 0

[tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit f4408747d3e8de35f6beaf37535315b907c87656 Merge: 744077d 6e96aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:23:14 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 src/or/config.c | 5 ----- 1 file changed, 5 deletions(-) diff --cc src/or/config.c index 0850013,0f36738..908f098 --- a/src/or/config.c +++ b/src/or/config.c @@@ -919,14 -877,8 +919,9 @@@ static const char *default_authorities[ "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417" - /* XX/teor - urras may have an IPv6 address, but it's not in urras' - * descriptor as of 11 Dec 2015. See #17813. */, "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "

1 0

[tor/maint-0.2.4] Remove urras as a default trusted directory authority
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7ae34e722aeccb199938d1c2faa243d23891a74c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jul 3 21:56:39 2016 +0200 Remove urras as a default trusted directory authority It had been a directory authority since 0.2.1.20. --- src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1610cad..709c5cc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -802,8 +802,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 no-v2 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",

1 0

[tor/master] prop250: Plug TorVersion memleak in disk_state_reset().
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit f03c74c6315598b1a7634a4dfcdebbed1e147d08 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 4 12:28:28 2016 +0300 prop250: Plug TorVersion memleak in disk_state_reset(). --- src/or/shared_random_state.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 73df9c4..7d34334 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -597,10 +597,16 @@ disk_state_put_srv_line(const sr_srv_t *srv, config_line_t *line) static void disk_state_reset(void) { + /* Free allocated memory */ config_free_lines(sr_disk_state->Commit); config_free_lines(sr_disk_state->SharedRandValues); config_free_lines(sr_disk_state->ExtraLines); + tor_free(sr_disk_state->TorVersion); + + /* Clean up the struct */ memset(sr_disk_state, 0, sizeof(*sr_disk_state)); + + /* Reset it with useful data */ sr_disk_state->magic_ = SR_DISK_STATE_MAGIC; sr_disk_state->TorVersion = tor_strdup(get_version()); }

1 0

[tor/master] prop250: Fix voting_schedule_t memleak in sr_state_update().
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 34bd333529a73d015561388159d7648b17fcdfa7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 4 12:36:53 2016 +0300 prop250: Fix voting_schedule_t memleak in sr_state_update(). --- src/or/shared_random.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/shared_random.c b/src/or/shared_random.c index e9e6cbc..fe98643 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -1291,7 +1291,6 @@ sr_get_string_for_consensus(const smartlist_t *votes, void sr_act_post_consensus(const networkstatus_t *consensus) { - time_t interval_starts; const or_options_t *options = get_options(); /* Don't act if our state hasn't been initialized. We can be called during @@ -1321,10 +1320,14 @@ sr_act_post_consensus(const networkstatus_t *consensus) sr_state_set_current_srv(srv_dup(consensus->sr_info.current_srv)); } - /* Update our internal state with the next voting interval starting time. */ - interval_starts = get_voting_schedule(options, time(NULL), - LOG_NOTICE)->interval_starts; - sr_state_update(interval_starts); + /* Prepare our state so that it's ready for the next voting period. */ + { + voting_schedule_t *voting_schedule = + get_voting_schedule(options,time(NULL), LOG_NOTICE); + time_t interval_starts = voting_schedule->interval_starts; + sr_state_update(interval_starts); + tor_free(voting_schedule); + } } /* Initialize shared random subsystem. This MUST be called early in the boot

1 0

[tor/master] Merge remote-tracking branch 'asn/bug19555'
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit e11cc95717736f5818745654f24a2ee5440057d2 Merge: 87758db 34bd333 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:17:21 2016 -0400 Merge remote-tracking branch 'asn/bug19555' src/or/shared_random.c | 13 ++++++++----- src/or/shared_random_state.c | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/master] sr: Remove useless code in disk_state_update()
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit c6de05d529dddebbdd7f9bcd36ca69d9a5e17d66 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 4 11:33:41 2016 -0400 sr: Remove useless code in disk_state_update() This patch also updates a comment in the same function for accuracy. Found by Coverity issue 1362985. Partily fixes #19567. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/shared_random_state.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 73df9c4..870b992 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -617,26 +617,24 @@ disk_state_update(void) /* Reset current disk state. */ disk_state_reset(); - /* First, update elements that we don't need to iterate over a list to - * construct something. */ + /* First, update elements that we don't need to do a construction. */ sr_disk_state->Version = sr_state->version; sr_disk_state->ValidUntil = sr_state->valid_until; sr_disk_state->ValidAfter = sr_state->valid_after; /* Shared random values. */ next = &sr_disk_state->SharedRandValues; - *next = NULL; if (sr_state->previous_srv != NULL) { *next = line = tor_malloc_zero(sizeof(config_line_t)); line->key = tor_strdup(dstate_prev_srv_key); disk_state_put_srv_line(sr_state->previous_srv, line); + /* Go to the next shared random value. */ next = &(line->next); } if (sr_state->current_srv != NULL) { *next = line = tor_malloc_zero(sizeof(*line)); line->key = tor_strdup(dstate_cur_srv_key); disk_state_put_srv_line(sr_state->current_srv, line); - next = &(line->next); } /* Parse the commits and construct config line(s). */

1 0

[tor/master] test: Fix shared random buffer overrun
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7d04638a608a150b80442198df401b8be5ea8a3a Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 4 11:40:06 2016 -0400 test: Fix shared random buffer overrun Encoded commit has an extra byte at the end for the NUL terminated byte and the test was overrunning the payload buffer by one byte. Found by Coverity issue 1362984. Fixes #19567 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_shared_random.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index d001785..2bdce7d 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -932,13 +932,14 @@ test_utils(void *arg) /* Testing commitments_are_the_same(). Currently, the check is to test the * value of the encoded commit so let's make sure that actually works. */ { - /* Payload of 55 bytes that is the length of - * sr_commit_t->encoded_commit. */ + /* Payload of 57 bytes that is the length of sr_commit_t->encoded_commit. + * 56 bytes of payload and a NUL terminated byte at the end ('\x00') + * which comes down to SR_COMMIT_BASE64_LEN + 1. */ const char *payload = "\x5d\xb9\x60\xb6\xcc\x51\x68\x52\x31\xd9\x88\x88\x71\x71\xe0\x30" "\x59\x55\x7f\xcd\x61\xc0\x4b\x05\xb8\xcd\xc1\x48\xe9\xcd\x16\x1f" "\x70\x15\x0c\xfc\xd3\x1a\x75\xd0\x93\x6c\xc4\xe0\x5c\xbe\xe2\x18" - "\xc7\xaf\x72\xb6\x7c\x9b\x52"; + "\xc7\xaf\x72\xb6\x7c\x9b\x52\x00"; sr_commit_t commit1, commit2; memcpy(commit1.encoded_commit, payload, sizeof(commit1.encoded_commit)); memcpy(commit2.encoded_commit, payload, sizeof(commit2.encoded_commit));

1 0