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

[tor/master] Merge branch 'ticket21859_032_01_squashed'
by nickm＠torproject.org 07 Jul '17

07 Jul '17

1 0

[tor/master] Fix wide lines
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 6a64563b1d608dbc09f38b50cc47d0ae2de7836d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 11:15:27 2017 -0400 Fix wide lines --- src/or/hs_ntor.h | 3 ++- src/test/test_hs_service.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/hs_ntor.h b/src/or/hs_ntor.h index 37c3261..d07bff8 100644 --- a/src/or/hs_ntor.h +++ b/src/or/hs_ntor.h @@ -55,7 +55,8 @@ int hs_ntor_service_get_rendezvous1_keys( const curve25519_public_key_t *client_ephemeral_enc_pubkey, hs_ntor_rend_cell_keys_t *hs_ntor_rend_cell_keys_out); -int hs_ntor_circuit_key_expansion(const uint8_t *ntor_key_seed, size_t seed_len, +int hs_ntor_circuit_key_expansion(const uint8_t *ntor_key_seed, + size_t seed_len, uint8_t *keys_out, size_t keys_out_len); int hs_ntor_client_rendezvous2_mac_is_good( diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index aa9a12e..17772f1 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -291,8 +291,8 @@ test_e2e_rend_circuit_setup(void *arg) { uint8_t ntor_key_seed[DIGEST256_LEN] = {2}; retval = hs_circuit_setup_e2e_rend_circ(or_circ, - ntor_key_seed, sizeof(ntor_key_seed), - 1); + ntor_key_seed, sizeof(ntor_key_seed), + 1); tt_int_op(retval, OP_EQ, 0); }

1 0

[tor/master] mingw fix: avoid "unused var" warning.
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit ae756f251ffe155336deef0bb97643203d1cfa56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 6 13:12:33 2017 -0400 mingw fix: avoid "unused var" warning. This is a backport of 19615bce64cd381a925bc3910120ac39ca918e7c to fix bug 22838. --- changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug22838_028 b/changes/bug22838_028 new file mode 100644 index 0000000..1d0a4fb --- /dev/null +++ b/changes/bug22838_028 @@ -0,0 +1,5 @@ + o Minor bugfixes (compilation, mingw, backport from 0.3.1.1-alpha): + - Backport a fix for an "unused variable" warning that appeared + in some versions of mingw. Fixes bug 22838; bugfix on + 0.2.8.1-alpha. + diff --git a/src/test/test_switch_id.c b/src/test/test_switch_id.c index 322f5bd..e12205b 100644 --- a/src/test/test_switch_id.c +++ b/src/test/test_switch_id.c @@ -79,6 +79,7 @@ main(int argc, char **argv) #if defined(_WIN32) (void) argc; (void) argv; + (void) which_test; fprintf(stderr, "This test is not supported on your OS.\n"); return 77;

1 0

[tor/release-0.3.0] Merge branch 'bug22838_028' into maint-0.2.8
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 48e45e2fb1efa37dd08373e969d339c785585a7d Merge: c1e4aff ae756f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:55:51 2017 -0400 Merge branch 'bug22838_028' into maint-0.2.8 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

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

07 Jul '17

commit 5c64d56a4144d6642288a224a4dcbd06f30ec03a Merge: 8f6e897 48e45e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:55:57 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'bug22838_028' into maint-0.2.8
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 48e45e2fb1efa37dd08373e969d339c785585a7d Merge: c1e4aff ae756f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:55:51 2017 -0400 Merge branch 'bug22838_028' into maint-0.2.8 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

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

07 Jul '17

commit ed0fb218342dcf7cc54f6abd9078dcd3efa5452c Merge: 4858cda 48e45e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

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

07 Jul '17

commit 66c85cd8812c7d862edafc03b8e04bf3555733a3 Merge: 2dd1e21 ed0fb21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:56:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'bug22838_028' into maint-0.2.8
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 48e45e2fb1efa37dd08373e969d339c785585a7d Merge: c1e4aff ae756f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:55:51 2017 -0400 Merge branch 'bug22838_028' into maint-0.2.8 changes/bug22838_028 | 5 +++++ src/test/test_switch_id.c | 1 + 2 files changed, 6 insertions(+)

1 0

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

07 Jul '17

commit c1bdc3b10e66de6d79c48c94628956b8578d5f17 Merge: 0e5cf4a 66c85cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 10:57:05 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 This is an "ours" commit to avoid taking the fix for 22838, which we already have here.

1 0