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

[torspec/master] dir-spec: Update the Tor version for bandwidth-file-digest
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit f020c4f49be1ead92f036a9687c8c8a35062a648 Author: teor <teor(a)torproject.org> Date: Sat Mar 30 12:39:23 2019 +1000 dir-spec: Update the Tor version for bandwidth-file-digest Part of 29959. --- dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index e62d9cc..3f14470 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2168,7 +2168,8 @@ If an authority is configured with a V3BandwidthsFile, but parsing fails, this line SHOULD appear in its vote, with the digest(s) of the unparseable file. - First-appeared: Tor 0.4.0.2-alpha + + First-appeared: Tor 0.4.0.4-alpha The authority section of a vote contains the following items, followed in turn by the authority's current key certificate:

1 0

[torspec/master] Merge remote-tracking branch 'tor-github/pr/73'
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit 54ebbd5643600268b6af16c8603089898b72f9cb Merge: fd9ccd5 f020c4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:29:14 2019 -0400 Merge remote-tracking branch 'tor-github/pr/73' dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] bwauth: Actually include the bandwidth-file-digest in authority votes
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit 8e961b2174f6714fdff295f032abe993f864b81b Author: teor <teor(a)torproject.org> Date: Sat Mar 30 12:09:47 2019 +1000 bwauth: Actually include the bandwidth-file-digest in authority votes Fixes bug 29959; bugfix on 0.4.0.2-alpha. --- changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/changes/bug29959-040 b/changes/bug29959-040 new file mode 100644 index 000000000..3740e0169 --- /dev/null +++ b/changes/bug29959-040 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authorities): + - Actually include the bandwidth-file-digest line in directory authority + votes. Fixes bug 29959; bugfix on 0.4.0.2-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index ba7b2f1de..29f5d0450 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -320,18 +320,17 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, if (!tor_digest256_is_zero((const char *)v3_ns->bw_file_digest256)) { /* Encode the digest. */ char b64_digest_bw_file[BASE64_DIGEST256_LEN+1] = {0}; - if (digest256_to_base64(b64_digest_bw_file, - (const char *)v3_ns->bw_file_digest256)>0) { - /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ - char *digest_algo_b64_digest_bw_file = NULL; - tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", - crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), - b64_digest_bw_file); - /* No need for tor_strdup(""), format_line_if_present does it. */ - bw_file_digest = format_line_if_present( + digest256_to_base64(b64_digest_bw_file, + (const char *)v3_ns->bw_file_digest256); + /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ + char *digest_algo_b64_digest_bw_file = NULL; + tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", + crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), + b64_digest_bw_file); + /* No need for tor_strdup(""), format_line_if_present does it. */ + bw_file_digest = format_line_if_present( "bandwidth-file-digest", digest_algo_b64_digest_bw_file); - tor_free(digest_algo_b64_digest_bw_file); - } + tor_free(digest_algo_b64_digest_bw_file); } smartlist_add_asprintf(chunks,

1 0

[tor/master] Merge branch 'bug29959_040_squashed' into maint-0.4.0
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit d016bbaa7dfb3586c682c0070b79e174e8a73c19 Merge: 42aae0e69 8e961b217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:26:47 2019 -0400 Merge branch 'bug29959_040_squashed' into maint-0.4.0 changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0

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

05 Apr '19

commit 0e7b34354a1789ff3b2d39a98ca8ebcb37ef4664 Merge: 0b6769a99 d016bbaa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:27:04 2019 -0400 Merge branch 'maint-0.4.0' changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.0] bwauth: Actually include the bandwidth-file-digest in authority votes
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit 8e961b2174f6714fdff295f032abe993f864b81b Author: teor <teor(a)torproject.org> Date: Sat Mar 30 12:09:47 2019 +1000 bwauth: Actually include the bandwidth-file-digest in authority votes Fixes bug 29959; bugfix on 0.4.0.2-alpha. --- changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/changes/bug29959-040 b/changes/bug29959-040 new file mode 100644 index 000000000..3740e0169 --- /dev/null +++ b/changes/bug29959-040 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authorities): + - Actually include the bandwidth-file-digest line in directory authority + votes. Fixes bug 29959; bugfix on 0.4.0.2-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index ba7b2f1de..29f5d0450 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -320,18 +320,17 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, if (!tor_digest256_is_zero((const char *)v3_ns->bw_file_digest256)) { /* Encode the digest. */ char b64_digest_bw_file[BASE64_DIGEST256_LEN+1] = {0}; - if (digest256_to_base64(b64_digest_bw_file, - (const char *)v3_ns->bw_file_digest256)>0) { - /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ - char *digest_algo_b64_digest_bw_file = NULL; - tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", - crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), - b64_digest_bw_file); - /* No need for tor_strdup(""), format_line_if_present does it. */ - bw_file_digest = format_line_if_present( + digest256_to_base64(b64_digest_bw_file, + (const char *)v3_ns->bw_file_digest256); + /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ + char *digest_algo_b64_digest_bw_file = NULL; + tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", + crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), + b64_digest_bw_file); + /* No need for tor_strdup(""), format_line_if_present does it. */ + bw_file_digest = format_line_if_present( "bandwidth-file-digest", digest_algo_b64_digest_bw_file); - tor_free(digest_algo_b64_digest_bw_file); - } + tor_free(digest_algo_b64_digest_bw_file); } smartlist_add_asprintf(chunks,

1 0

[tor/release-0.4.0] Merge branch 'bug29959_040_squashed' into maint-0.4.0
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit d016bbaa7dfb3586c682c0070b79e174e8a73c19 Merge: 42aae0e69 8e961b217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:26:47 2019 -0400 Merge branch 'bug29959_040_squashed' into maint-0.4.0 changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit 8a010c8b833dd5045e815c476afaf3632a8a29a3 Merge: de0babab9 d016bbaa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:27:04 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.0] bwauth: Actually include the bandwidth-file-digest in authority votes
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit 8e961b2174f6714fdff295f032abe993f864b81b Author: teor <teor(a)torproject.org> Date: Sat Mar 30 12:09:47 2019 +1000 bwauth: Actually include the bandwidth-file-digest in authority votes Fixes bug 29959; bugfix on 0.4.0.2-alpha. --- changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/changes/bug29959-040 b/changes/bug29959-040 new file mode 100644 index 000000000..3740e0169 --- /dev/null +++ b/changes/bug29959-040 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory authorities): + - Actually include the bandwidth-file-digest line in directory authority + votes. Fixes bug 29959; bugfix on 0.4.0.2-alpha. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index ba7b2f1de..29f5d0450 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -320,18 +320,17 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, if (!tor_digest256_is_zero((const char *)v3_ns->bw_file_digest256)) { /* Encode the digest. */ char b64_digest_bw_file[BASE64_DIGEST256_LEN+1] = {0}; - if (digest256_to_base64(b64_digest_bw_file, - (const char *)v3_ns->bw_file_digest256)>0) { - /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ - char *digest_algo_b64_digest_bw_file = NULL; - tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", - crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), - b64_digest_bw_file); - /* No need for tor_strdup(""), format_line_if_present does it. */ - bw_file_digest = format_line_if_present( + digest256_to_base64(b64_digest_bw_file, + (const char *)v3_ns->bw_file_digest256); + /* "bandwidth-file-digest" 1*(SP algorithm "=" digest) NL */ + char *digest_algo_b64_digest_bw_file = NULL; + tor_asprintf(&digest_algo_b64_digest_bw_file, "%s=%s", + crypto_digest_algorithm_get_name(DIGEST_ALG_BW_FILE), + b64_digest_bw_file); + /* No need for tor_strdup(""), format_line_if_present does it. */ + bw_file_digest = format_line_if_present( "bandwidth-file-digest", digest_algo_b64_digest_bw_file); - tor_free(digest_algo_b64_digest_bw_file); - } + tor_free(digest_algo_b64_digest_bw_file); } smartlist_add_asprintf(chunks,

1 0

[tor/maint-0.4.0] Merge branch 'bug29959_040_squashed' into maint-0.4.0
by nickm＠torproject.org 05 Apr '19

05 Apr '19

commit d016bbaa7dfb3586c682c0070b79e174e8a73c19 Merge: 42aae0e69 8e961b217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 4 20:26:47 2019 -0400 Merge branch 'bug29959_040_squashed' into maint-0.4.0 changes/bug29959-040 | 3 +++ src/feature/dirauth/dirvote.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-)

1 0