September 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 912ae2b8dc5d13344035def71c6e083a92752c09 Merge: 1570f17f9 9d5c6317b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:44:36 2018 -0400 Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9 changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit df18cf0e8fa9195df82bef9535f920ad913efab7 Merge: 08d5fd39d a5ed62f96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:44:40 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.4] hs: Silence a spurious warning in rend_client_send_introduction()
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 9d5c6317b51530d606222cc2b7f6f5f5d7defe24 Author: teor <teor(a)torproject.org> Date: Wed Sep 5 21:07:58 2018 +1000 hs: Silence a spurious warning in rend_client_send_introduction() gcc 8 warns that extend_info_t.nickname might be truncated by strncpy(). But it doesn't know that nickname can either contain a hex id, or a nicknames. hex ids are only used for general and HSDir circuits. Fixes bug 27463; bugfix on 0.1.1.2-alpha. --- changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/changes/bug27463 b/changes/bug27463 new file mode 100644 index 000000000..073acdd99 --- /dev/null +++ b/changes/bug27463 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services): + - Silence a spurious compiler warning in rend_client_send_introduction(). + Fixes bug 27463; bugfix on 0.1.1.2-alpha. diff --git a/src/or/rendclient.c b/src/or/rendclient.c index a93bc94a9..f0144b076 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -269,6 +269,15 @@ rend_client_send_introduction(origin_circuit_t *introcirc, dh_offset = v3_shift+7+DIGEST_LEN+2+klen+REND_COOKIE_LEN; } else { /* Version 0. */ + + /* Some compilers are smart enough to work out that nickname can be more + * than 19 characters, when it's a hexdigest. They warn that strncpy() + * will truncate hexdigests without NUL-terminating them. But we only put + * hexdigests in HSDir and general circuit exits. */ + if (BUG(strlen(rendcirc->build_state->chosen_exit->nickname) + > MAX_NICKNAME_LEN)) { + goto perm_err; + } strncpy(tmp, rendcirc->build_state->chosen_exit->nickname, (MAX_NICKNAME_LEN+1)); /* nul pads */ memcpy(tmp+MAX_NICKNAME_LEN+1, rendcirc->rend_data->rend_cookie,

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit a4930de5e96b83295478386cd15c8a7a3e8c0ef8 Merge: b6de39e5f df18cf0e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:44:40 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit a5ed62f96cafa1be251f9a7b4aafa519de4c2645 Merge: a08e6e711 912ae2b8d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:44:39 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit df18cf0e8fa9195df82bef9535f920ad913efab7 Merge: 08d5fd39d a5ed62f96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:44:40 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27463 | 3 +++ src/or/rendclient.c | 9 +++++++++ 2 files changed, 12 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit a08e6e711fbcd6a12818f1fe14739fc0e870434d Merge: 57b207efa 1570f17f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27465 | 5 +++++ src/common/address.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Windows: Silence a spurious warning in the GetAdaptersAddresses cast
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 1570f17f97ad99ddf3f63745ab3571c1aa411141 Author: teor <teor(a)torproject.org> Date: Thu Sep 6 13:11:23 2018 +1000 Windows: Silence a spurious warning in the GetAdaptersAddresses cast GetProcAddress() returns FARPROC, which is (long long int(*)()) on 64-bit Windows: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).… But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit and 64-bit Windows: https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-g… So gcc 8 issues a spurious "incompatible function pointer" warning about the cast to GetAdaptersAddresses_fn_t. Silence this warning by casting to a void function pointer, before the cast to GetAdaptersAddresses_fn_t. This issue is already fixed by 26481 in 0.3.5 and later, by removing the lookup and cast. Fixes bug 27465; bugfix on 0.2.3.11-alpha. --- changes/bug27465 | 5 +++++ src/common/address.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug27465 b/changes/bug27465 new file mode 100644 index 000000000..743b35130 --- /dev/null +++ b/changes/bug27465 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Silence a spurious compiler warning on the GetAdaptersAddresses + function pointer cast. This issue is already fixed by 26481 in + 0.3.5 and later, by removing the lookup and cast. + Fixes bug 27465; bugfix on 0.2.3.11-alpha. diff --git a/src/common/address.c b/src/common/address.c index 96b99fa08..794345a13 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1492,7 +1492,10 @@ get_interface_addresses_win32(int severity, sa_family_t family) goto done; } - if (!(fn = (GetAdaptersAddresses_fn_t) + /* Cast through a void function pointer, to silence a spurious compiler + * warning on 64-bit Windows. This cast is safe, because we are casting to + * the correct type for GetAdaptersAddresses(). */ + if (!(fn = (GetAdaptersAddresses_fn_t)(void(*)(void)) GetProcAddress(lib, "GetAdaptersAddresses"))) { log_fn(severity, LD_NET, "Unable to obtain pointer to " "GetAdaptersAddresses");

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 08d5fd39d85d4f7174b52ef5d53db001398481ea Merge: a7e72f0c4 a08e6e711 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 08:42:19 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27465 | 5 +++++ src/common/address.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Windows: Silence a spurious warning in the GetAdaptersAddresses cast
by nickm＠torproject.org 07 Sep '18

07 Sep '18

commit 1570f17f97ad99ddf3f63745ab3571c1aa411141 Author: teor <teor(a)torproject.org> Date: Thu Sep 6 13:11:23 2018 +1000 Windows: Silence a spurious warning in the GetAdaptersAddresses cast GetProcAddress() returns FARPROC, which is (long long int(*)()) on 64-bit Windows: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).… But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit and 64-bit Windows: https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-g… So gcc 8 issues a spurious "incompatible function pointer" warning about the cast to GetAdaptersAddresses_fn_t. Silence this warning by casting to a void function pointer, before the cast to GetAdaptersAddresses_fn_t. This issue is already fixed by 26481 in 0.3.5 and later, by removing the lookup and cast. Fixes bug 27465; bugfix on 0.2.3.11-alpha. --- changes/bug27465 | 5 +++++ src/common/address.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug27465 b/changes/bug27465 new file mode 100644 index 000000000..743b35130 --- /dev/null +++ b/changes/bug27465 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation): + - Silence a spurious compiler warning on the GetAdaptersAddresses + function pointer cast. This issue is already fixed by 26481 in + 0.3.5 and later, by removing the lookup and cast. + Fixes bug 27465; bugfix on 0.2.3.11-alpha. diff --git a/src/common/address.c b/src/common/address.c index 96b99fa08..794345a13 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1492,7 +1492,10 @@ get_interface_addresses_win32(int severity, sa_family_t family) goto done; } - if (!(fn = (GetAdaptersAddresses_fn_t) + /* Cast through a void function pointer, to silence a spurious compiler + * warning on 64-bit Windows. This cast is safe, because we are casting to + * the correct type for GetAdaptersAddresses(). */ + if (!(fn = (GetAdaptersAddresses_fn_t)(void(*)(void)) GetProcAddress(lib, "GetAdaptersAddresses"))) { log_fn(severity, LD_NET, "Unable to obtain pointer to " "GetAdaptersAddresses");

1 0