March 2019 - tor-commits - lists.torproject.org

[tor/master] test/sr: Clear SRVs after init, and before setup
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit c44ad396f89e755f5a639b382e0a55ed1cbcc177 Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:12:25 2019 +1000 test/sr: Clear SRVs after init, and before setup Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706. --- src/test/test_shared_random.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 0a3c2e119..526fb09b6 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -54,6 +54,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -449,20 +452,26 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). */ +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * + * You must call sr_state_free() to free the state at the end of each test + * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. + * In 0.3.5 and earlier, sr_state_set_previous_srv() and + * sr_state_set_current_srv() do not free() the old srvs. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -472,8 +481,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/master] test/sr: update sr_state_free() to sr_state_free_all() in a comment
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit aec6ee201bbf63f54bcf879de10addf00779504c Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:28:34 2019 +1000 test/sr: update sr_state_free() to sr_state_free_all() in a comment --- src/test/test_shared_random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 2d07eb219..630883e1f 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -551,7 +551,7 @@ test_encoding(void *arg) * If also_current is set, then set both current and previous SRVs. * Otherwise, just set the previous SRV. (And clear the current SRV.) * - * You must call sr_state_free() to free the state at the end of each test + * You must call sr_state_free_all() to free the state at the end of each test * function (on pass or fail). */ static void test_sr_setup_srv(int also_current)

1 0

[tor/master] Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit 1d0146e2a23180d6c3764fd51a29f84a4127d58e Merge: e021f89f3 c44ad396f Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:27:59 2019 +1000 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge changes/bug29706_minimal | 4 ++++ src/or/dirauth/shared_random_state.c | 4 ++-- src/or/dirauth/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc src/or/dirauth/shared_random_state.h index 60a326f86,cf027f2d3..d31983d18 --- a/src/or/dirauth/shared_random_state.h +++ b/src/or/dirauth/shared_random_state.h @@@ -140,8 -140,10 +140,10 @@@ STATIC int is_phase_transition(sr_phase STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); + STATIC void state_del_previous_srv(void); + STATIC void state_del_current_srv(void); -#endif /* TOR_UNIT_TESTS */ +#endif /* defined(TOR_UNIT_TESTS) */ -#endif /* TOR_SHARED_RANDOM_STATE_H */ +#endif /* !defined(TOR_SHARED_RANDOM_STATE_H) */

1 0

[tor/master] Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit af21d126e6b138c6f986f02c33c8c38d9bcd537f Merge: 1547fd99a 55865a2c9 Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:30:37 2019 +1000 Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge Comment merge. src/test/test_shared_random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit a80131765a016032f46e09bff9d8b8e160618fe3 Merge: 4c22c1113 de5ab1ef4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 09:32:24 2019 -0400 Merge branch 'maint-0.4.0' src/test/test_shared_random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] test/sr: Clear SRVs after init, and before setup
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit c44ad396f89e755f5a639b382e0a55ed1cbcc177 Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:12:25 2019 +1000 test/sr: Clear SRVs after init, and before setup Already merged to 0.4.0 and later in tor-github/pr/776. Backported to 0.2.9 and later with minor comment changes. Part of 29706. --- src/test/test_shared_random.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 0a3c2e119..526fb09b6 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -54,6 +54,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -449,20 +452,26 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). */ +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * + * You must call sr_state_free() to free the state at the end of each test + * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. + * In 0.3.5 and earlier, sr_state_set_previous_srv() and + * sr_state_set_current_srv() do not free() the old srvs. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -472,8 +481,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/release-0.4.0] Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit 1d0146e2a23180d6c3764fd51a29f84a4127d58e Merge: e021f89f3 c44ad396f Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:27:59 2019 +1000 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge changes/bug29706_minimal | 4 ++++ src/or/dirauth/shared_random_state.c | 4 ++-- src/or/dirauth/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-) diff --cc src/or/dirauth/shared_random_state.h index 60a326f86,cf027f2d3..d31983d18 --- a/src/or/dirauth/shared_random_state.h +++ b/src/or/dirauth/shared_random_state.h @@@ -140,8 -140,10 +140,10 @@@ STATIC int is_phase_transition(sr_phase STATIC void set_sr_phase(sr_phase_t phase); STATIC sr_state_t *get_sr_state(void); + STATIC void state_del_previous_srv(void); + STATIC void state_del_current_srv(void); -#endif /* TOR_UNIT_TESTS */ +#endif /* defined(TOR_UNIT_TESTS) */ -#endif /* TOR_SHARED_RANDOM_STATE_H */ +#endif /* !defined(TOR_SHARED_RANDOM_STATE_H) */

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit de5ab1ef49559ed24b639bbf052ea584db2f2b77 Merge: b4483edce af21d126e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 09:32:05 2019 -0400 Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0 src/test/test_shared_random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] test/sr: update sr_state_free() to sr_state_free_all() in a comment
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit aec6ee201bbf63f54bcf879de10addf00779504c Author: teor <teor(a)torproject.org> Date: Mon Mar 18 11:28:34 2019 +1000 test/sr: update sr_state_free() to sr_state_free_all() in a comment --- src/test/test_shared_random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 2d07eb219..630883e1f 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -551,7 +551,7 @@ test_encoding(void *arg) * If also_current is set, then set both current and previous SRVs. * Otherwise, just set the previous SRV. (And clear the current SRV.) * - * You must call sr_state_free() to free the state at the end of each test + * You must call sr_state_free_all() to free the state at the end of each test * function (on pass or fail). */ static void test_sr_setup_srv(int also_current)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
by nickm＠torproject.org 19 Mar '19

19 Mar '19

commit de5ab1ef49559ed24b639bbf052ea584db2f2b77 Merge: b4483edce af21d126e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 09:32:05 2019 -0400 Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0 src/test/test_shared_random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0