May 2020 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'bug34077_041' into maint-0.4.1
by nickm＠torproject.org 05 May '20

05 May '20

commit a02e866642c28b4c0cbe415f8573c4ede4d9caf7 Merge: 987f2fa50 d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:14:38 2020 -0400 Merge branch 'bug34077_041' into maint-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 05 May '20

05 May '20

commit f96b6ccee1945b2db32c858837ac21c6d81c820b Merge: 6dc9930d3 e61867416 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:53 2020 -0400 Merge branch 'maint-0.4.3' changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 05 May '20

05 May '20

commit 73c4bdaad517a8b8a344a6f523960eea7268192f Merge: 1163d9a62 a02e86664 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Merge branch 'bug34077_042' into bug34077_043
by nickm＠torproject.org 05 May '20

05 May '20

commit 6aaee6133d089611050a3507d7258486dcf97d1e Merge: 42507429c b4b1882da Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 23:01:58 2020 -0400 Merge branch 'bug34077_042' into bug34077_043 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 05 May '20

05 May '20

commit 21180862e07d38ed03a5f13b1f51ee13dacd40ef Merge: 71e72ce9c bbfc498e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:25:52 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Fix a GCC 10.0.1 compilation error.
by nickm＠torproject.org 05 May '20

05 May '20

commit b1c383e3e65ec539ebe4394652429f1954e3d805 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 23:04:56 2020 -0400 Fix a GCC 10.0.1 compilation error. Do not try to stuff "HS_DESC_DECODE_GENERIC_ERROR" (-1) into a socks5_reply_status_t (enum). It doesn't actually make sense, and isn't one of our documented extensions. (This can only happen on a nonfatal assertion that we haven't seen, so it probably isn't happening in practice.) Fixes another case of bug 34077; bugfix on 0.4.3.1-alpha. --- src/feature/hs/hs_client.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index da1202b64..68d6619ce 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1350,7 +1350,7 @@ client_desc_missing_bad_client_auth(const smartlist_t *entry_conns, /* We should not be called with another type of status. Recover by * sending a generic error. */ tor_assert_nonfatal_unreached(); - code = HS_DESC_DECODE_GENERIC_ERROR; + code = SOCKS5_GENERAL_ERROR; } entry_conn->socks_request->socks_extended_error_code = code; connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_MISC); @@ -2493,4 +2493,3 @@ set_hs_client_auths_map(digest256map_t *map) } #endif /* defined(TOR_UNIT_TESTS) */ -

1 0

[tor/release-0.4.2] Fix a GCC 10.0.1 compilation warning.
by nickm＠torproject.org 05 May '20

05 May '20

commit d7e166bd95411d3f5caa573e0293356bff78c481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:56:31 2020 -0400 Fix a GCC 10.0.1 compilation warning. Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56) --- changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug34077 b/changes/bug34077 new file mode 100644 index 000000000..29458bd9d --- /dev/null +++ b/changes/bug34077 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on + 0.4.0.3-alpha. diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index b669e3836..58c203e20 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after) sr_phase_t sr_state_get_phase(void) { - void *ptr; + void *ptr=NULL; state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr); + tor_assert(ptr); return *(sr_phase_t *) ptr; }

1 0

[tor/release-0.4.2] Merge branch 'bug34077_041' into maint-0.4.1
by nickm＠torproject.org 05 May '20

05 May '20

commit a02e866642c28b4c0cbe415f8573c4ede4d9caf7 Merge: 987f2fa50 d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 4 10:14:38 2020 -0400 Merge branch 'bug34077_041' into maint-0.4.1 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.3] Fix a GCC 10.0.1 compilation warning.
by nickm＠torproject.org 05 May '20

05 May '20

commit d7e166bd95411d3f5caa573e0293356bff78c481 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:56:31 2020 -0400 Fix a GCC 10.0.1 compilation warning. Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56) --- changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug34077 b/changes/bug34077 new file mode 100644 index 000000000..29458bd9d --- /dev/null +++ b/changes/bug34077 @@ -0,0 +1,3 @@ + o Minor bugfixes (compiler warnings): + - Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on + 0.4.0.3-alpha. diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index b669e3836..58c203e20 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -1057,8 +1057,9 @@ sr_state_set_valid_after(time_t valid_after) sr_phase_t sr_state_get_phase(void) { - void *ptr; + void *ptr=NULL; state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr); + tor_assert(ptr); return *(sr_phase_t *) ptr; }

1 0

[tor/release-0.4.3] Merge branch 'bug34077_041' into bug34077_042
by nickm＠torproject.org 05 May '20

05 May '20

commit b4b1882da012697136d3ffd40f693b1f97964a5b Merge: 2d34d4d1a d7e166bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 30 22:59:08 2020 -0400 Merge branch 'bug34077_041' into bug34077_042 changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0