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

[tor/maint-0.3.1] Add "fingerprint" line to bridge network status.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 5b5e20a478e7c151f78b8c905a2b8470a7a159be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 11 09:53:16 2017 +0200 Add "fingerprint" line to bridge network status. Implements #22207. --- changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/task-22207 b/changes/task-22207 new file mode 100644 index 0000000..6354483 --- /dev/null +++ b/changes/task-22207 @@ -0,0 +1,4 @@ + o Minor features: + - Add "fingerprint" line to networkstatus-bridges produced by + bridge authorities. Implements #22207. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index fffd107..3bbe636 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2308,13 +2308,22 @@ networkstatus_dump_bridge_status_to_file(time_t now) char *thresholds = NULL; char *published_thresholds_and_status = NULL; char published[ISO_TIME_LEN+1]; + const routerinfo_t *me = router_get_my_routerinfo(); + char fingerprint[FINGERPRINT_LEN+1]; + char *fingerprint_line = NULL; + if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); + } else { + log_warn(LD_BUG, "Error computing fingerprint for bridge status."); + } format_iso_time(published, now); dirserv_compute_bridge_flag_thresholds(); thresholds = dirserv_get_flag_thresholds_line(); tor_asprintf(&published_thresholds_and_status, - "published %s\nflag-thresholds %s\n%s", - published, thresholds, status); + "published %s\nflag-thresholds %s\n%s%s", + published, thresholds, fingerprint_line ? fingerprint_line : "", + status); tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", options->DataDirectory); write_str_to_file(fname,published_thresholds_and_status,0); @@ -2322,6 +2331,7 @@ networkstatus_dump_bridge_status_to_file(time_t now) tor_free(published_thresholds_and_status); tor_free(fname); tor_free(status); + tor_free(fingerprint_line); } /* DOCDOC get_net_param_from_list */

1 0

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

05 Jul '17

commit 93bd60e5b01beccbc0b5ac7c46d95660624f4ad6 Merge: 0dc7d68 2251667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:00:46 2017 -0400 Merge branch 'maint-0.3.1' changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Add "fingerprint" line to bridge network status.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 5b5e20a478e7c151f78b8c905a2b8470a7a159be Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 11 09:53:16 2017 +0200 Add "fingerprint" line to bridge network status. Implements #22207. --- changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/task-22207 b/changes/task-22207 new file mode 100644 index 0000000..6354483 --- /dev/null +++ b/changes/task-22207 @@ -0,0 +1,4 @@ + o Minor features: + - Add "fingerprint" line to networkstatus-bridges produced by + bridge authorities. Implements #22207. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index fffd107..3bbe636 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2308,13 +2308,22 @@ networkstatus_dump_bridge_status_to_file(time_t now) char *thresholds = NULL; char *published_thresholds_and_status = NULL; char published[ISO_TIME_LEN+1]; + const routerinfo_t *me = router_get_my_routerinfo(); + char fingerprint[FINGERPRINT_LEN+1]; + char *fingerprint_line = NULL; + if (me && crypto_pk_get_fingerprint(me->identity_pkey, fingerprint, 0) >= 0) { + tor_asprintf(&fingerprint_line, "fingerprint %s\n", fingerprint); + } else { + log_warn(LD_BUG, "Error computing fingerprint for bridge status."); + } format_iso_time(published, now); dirserv_compute_bridge_flag_thresholds(); thresholds = dirserv_get_flag_thresholds_line(); tor_asprintf(&published_thresholds_and_status, - "published %s\nflag-thresholds %s\n%s", - published, thresholds, status); + "published %s\nflag-thresholds %s\n%s%s", + published, thresholds, fingerprint_line ? fingerprint_line : "", + status); tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", options->DataDirectory); write_str_to_file(fname,published_thresholds_and_status,0); @@ -2322,6 +2331,7 @@ networkstatus_dump_bridge_status_to_file(time_t now) tor_free(published_thresholds_and_status); tor_free(fname); tor_free(status); + tor_free(fingerprint_line); } /* DOCDOC get_net_param_from_list */

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 2251667ff239d508be6b01a59a47d0c235da2465 Merge: 15b1357 5b5e20a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:00:43 2017 -0400 Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1 changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 2251667ff239d508be6b01a59a47d0c235da2465 Merge: 15b1357 5b5e20a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:00:43 2017 -0400 Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1 changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 02030009c5b150fe4cb3d46e0c4fab09e9654de7 Merge: adae5d3 2251667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 17:00:46 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 15b13578e89e79d1f2199e05e0b4faba2b64bf9d Merge: 9383fa3 55777b3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

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

05 Jul '17

commit 0dc7d68bb57309df11a70c63562d25dd2d1c63ad Merge: a85ee62 15b1357 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.3.1' src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Only disable -Wfloat-conversion on mingw when it exists.
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit dfc06148407a1610d515d45b344558850486bd98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:10:45 2017 -0400 Only disable -Wfloat-conversion on mingw when it exists. The 22081 fix disabled -Wfloat-conversion, but -Wfloat-conversion didn't exist in every relevant mingw; it was added in GCC 4.9.x some time, if the documentation can be trusted. Bug not in any released version of tor. --- src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index b7468df..9e61eb7 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5695,13 +5695,14 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(__MINGW32__) || defined(__MINGW64__) +#if (defined(__MINGW32__) || defined(__MINGW64__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. */ +#define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) #endif /* NaN is a special case that can't be used with the logic below. */ @@ -5729,7 +5730,7 @@ DISABLE_GCC_WARNING(float-conversion) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; -#if defined(__MINGW32__) || defined(__MINGW64__) +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING ENABLE_GCC_WARNING(float-conversion) #endif }

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 05 Jul '17

05 Jul '17

commit 55777b3ff90311212ac3f38829229fed7b7beffe Merge: 546f5b3 dfc0614 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 16:11:48 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/common/util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0