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

[tor/master] Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8
by nickm＠torproject.org 20 May '16

20 May '16

commit 33841a60303ce8febf8180829a868dcc43924d77 Merge: 0d6f293 2d21f03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 16:04:56 2016 -0400 Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8 src/or/networkstatus.c | 6 +++++- src/test/test_connection.c | 20 +++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8
by nickm＠torproject.org 20 May '16

20 May '16

commit 33841a60303ce8febf8180829a868dcc43924d77 Merge: 0d6f293 2d21f03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 16:04:56 2016 -0400 Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8 src/or/networkstatus.c | 6 +++++- src/test/test_connection.c | 20 +++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.8] Describe what happens when we get a consensus, but no certificates
by nickm＠torproject.org 20 May '16

20 May '16

commit c5d87ef6af78ec24bebac1c634dd8d16dda585f8 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu May 19 12:35:09 2016 -0400 Describe what happens when we get a consensus, but no certificates Comment-only change --- src/or/networkstatus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 01f571e..51fc011 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1236,7 +1236,11 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) /** Check if we need to download a consensus during tor's bootstrap phase. * If we have no consensus, or our consensus is unusably old, return 1. * As soon as we have received a consensus, return 0, even if we don't have - * enough certificates to validate it. */ + * enough certificates to validate it. + * If a fallback directory gives us a consensus we can never get certs for, + * check_consensus_waiting_for_certs() will wait 20 minutes before failing + * the cert downloads. After that, a new consensus will be fetched from a + * randomly chosen fallback. */ MOCK_IMPL(int, networkstatus_consensus_is_bootstrapping,(time_t now)) {

1 0

[tor/release-0.2.8] Fix unused-but-set-variable warnings in the connection unit tests
by nickm＠torproject.org 20 May '16

20 May '16

commit 2d21f03cdcf759e434b5f82abe9bd285c37004ff Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu May 19 12:49:36 2016 -0400 Fix unused-but-set-variable warnings in the connection unit tests No behaviour change - just remove the variables --- src/test/test_connection.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 5aa7964..bf95b0b 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -652,12 +652,8 @@ test_conn_download_status(void *arg) { dir_connection_t *conn = NULL; dir_connection_t *conn2 = NULL; - dir_connection_t *conn3 = NULL; dir_connection_t *conn4 = NULL; connection_t *ap_conn = NULL; - connection_t *ap_conn2 = NULL; - /* we never create an ap_conn for conn3 */ - connection_t *ap_conn4 = NULL; consensus_flavor_t usable_flavor = (consensus_flavor_t)arg; @@ -760,7 +756,8 @@ test_conn_download_status(void *arg) conn->base_.state = TEST_CONN_STATE; /* more connections, all not downloading */ - conn3 = test_conn_download_status_add_a_connection(res); + /* ignore the return value, it's free'd using the connection list */ + (void)test_conn_download_status_add_a_connection(res); tt_assert(networkstatus_consensus_is_already_downloading(res) == 0); tt_assert(networkstatus_consensus_is_already_downloading(other_res) == 0); tt_assert(connection_dir_count_by_purpose_and_resource( @@ -784,8 +781,9 @@ test_conn_download_status(void *arg) /* more connections, two downloading (should never happen, but needs * to be tested for completeness) */ conn2->base_.state = TEST_CONN_DL_STATE; - ap_conn2 = test_conn_get_linked_connection(TO_CONN(conn2), - TEST_CONN_ATTACHED_STATE); + /* ignore the return value, it's free'd using the connection list */ + (void)test_conn_get_linked_connection(TO_CONN(conn2), + TEST_CONN_ATTACHED_STATE); tt_assert(networkstatus_consensus_is_already_downloading(res) == 1); tt_assert(networkstatus_consensus_is_already_downloading(other_res) == 0); tt_assert(connection_dir_count_by_purpose_and_resource( @@ -823,8 +821,9 @@ test_conn_download_status(void *arg) * cache directory documents), both flavors downloading */ conn4->base_.state = TEST_CONN_DL_STATE; - ap_conn4 = test_conn_get_linked_connection(TO_CONN(conn4), - TEST_CONN_ATTACHED_STATE); + /* ignore the return value, it's free'd using the connection list */ + (void)test_conn_get_linked_connection(TO_CONN(conn4), + TEST_CONN_ATTACHED_STATE); tt_assert(networkstatus_consensus_is_already_downloading(res) == 1); tt_assert(networkstatus_consensus_is_already_downloading(other_res) == 1); tt_assert(connection_dir_count_by_purpose_and_resource( @@ -833,10 +832,9 @@ test_conn_download_status(void *arg) tt_assert(connection_dir_count_by_purpose_and_resource( TEST_CONN_RSRC_PURPOSE, other_res) == 1); - conn4->base_.state = TEST_CONN_STATE; done: - /* the teardown function removes all the connections */; + /* the teardown function removes all the connections in the global list*/; } #define CONNECTION_TESTCASE(name, fork, setup) \

1 0

[tor/master] Add __mulodi4 source to src/ext
by nickm＠torproject.org 20 May '16

20 May '16

commit 33034600c250068cb1c413ddf9dba894f8ca6182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 18 09:41:07 2016 -0400 Add __mulodi4 source to src/ext We need to define this function when compiling with clang -m32 -ftrapv, since otherwise we get link errors, since apparently some versions of libclang_rt.builtins don't define a version of it that works? Or clang doesn't know to look for it? This definition is taken from the LLVM source at https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/builtins/mulodi4.c I've also included the license (dual BSD-ish/MIT-ish). --- LICENSE | 104 +++++++++++++++++++++++++++++++++++++++++++++ src/ext/README | 7 +++ src/ext/mulodi/LICENSE.TXT | 91 +++++++++++++++++++++++++++++++++++++++ src/ext/mulodi/mulodi4.c | 64 ++++++++++++++++++++++++++++ 4 files changed, 266 insertions(+) diff --git a/LICENSE b/LICENSE index bc0ac41..56d1002 100644 --- a/LICENSE +++ b/LICENSE @@ -271,6 +271,110 @@ src/ext/readpassphrase.[ch] are distributed under this license: Materiel Command, USAF, under agreement number F39502-99-1-0512. =============================================================================== +src/ext/mulodi4.c is distributed under this license: + + ========================================================================= + compiler_rt License + ========================================================================= + + The compiler_rt library is dual licensed under both the + University of Illinois "BSD-Like" license and the MIT license. + As a user of this code you may choose to use it under either + license. As a contributor, you agree to allow your code to be + used under both. + + Full text of the relevant licenses is included below. + + ========================================================================= + + University of Illinois/NCSA + Open Source License + + Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT + + All rights reserved. + + Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal with the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the following + disclaimers. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimers in the documentation and/or other materials + provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois + at Urbana-Champaign, nor the names of its contributors may + be used to endorse or promote products derived from this + Software without specific prior written permission. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS WITH THE SOFTWARE. + + ========================================================================= + + Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + ========================================================================= + Copyrights and Licenses for Third Party Software Distributed with LLVM: + ========================================================================= + + The LLVM software contains code written by third parties. Such + software will have its own individual LICENSE.TXT file in the + directory in which it appears. This file will describe the + copyrights, license, and restrictions which apply to that code. + + The disclaimer of warranty in the University of Illinois Open + Source License applies to all code in the LLVM Distribution, and + nothing in any of the other licenses gives permission to use the + names of the LLVM Team or the University of Illinois to endorse + or promote products derived from this Software. + +=============================================================================== If you got Tor as a static binary with OpenSSL included, then you should know: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)" diff --git a/src/ext/README b/src/ext/README index c180927..dfe620e 100644 --- a/src/ext/README +++ b/src/ext/README @@ -77,3 +77,10 @@ readpassphrase.[ch] timeouts/ William Ahern's hierarchical timer-wheel implementation. MIT license. + +mulodi/ + + Contains an overflow-checking 64-bit signed integer multiply + from LLVM's compiler_rt. For some reason, this is missing from + 32-bit libclang in many places. Dual licensed MIT-license and + BSD-like license; see mulodi/LICENSE.TXT. diff --git a/src/ext/mulodi/LICENSE.TXT b/src/ext/mulodi/LICENSE.TXT new file mode 100644 index 0000000..a17dc12 --- /dev/null +++ b/src/ext/mulodi/LICENSE.TXT @@ -0,0 +1,91 @@ +============================================================================== +compiler_rt License +============================================================================== + +The compiler_rt library is dual licensed under both the University of Illinois +"BSD-Like" license and the MIT license. As a user of this code you may choose +to use it under either license. As a contributor, you agree to allow your code +to be used under both. + +Full text of the relevant licenses is included below. + +============================================================================== + +University of Illinois/NCSA +Open Source License + +Copyright (c) 2009-2016 by the contributors listed in CREDITS.TXT + +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== + +Copyright (c) 2009-2015 by the contributors listed in CREDITS.TXT + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + diff --git a/src/ext/mulodi/mulodi4.c b/src/ext/mulodi/mulodi4.c new file mode 100644 index 0000000..7e3dfda --- /dev/null +++ b/src/ext/mulodi/mulodi4.c @@ -0,0 +1,64 @@ +/*===-- mulodi4.c - Implement __mulodi4 -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + * + * This file implements __mulodi4 for the compiler_rt library. + * + * ===----------------------------------------------------------------------=== + */ + +#if 0 +#include "int_lib.h" +#else +#define COMPILER_RT_ABI +#define di_int int64_t +#include "torint.h" +#endif + +/* Returns: a * b */ + +/* Effects: sets *overflow to 1 if a * b overflows */ + +COMPILER_RT_ABI di_int +__mulodi4(di_int a, di_int b, int* overflow) +{ + const int N = (int)(sizeof(di_int) * CHAR_BIT); + const di_int MIN = (di_int)1 << (N-1); + const di_int MAX = ~MIN; + *overflow = 0; + di_int result = a * b; + if (a == MIN) + { + if (b != 0 && b != 1) + *overflow = 1; + return result; + } + if (b == MIN) + { + if (a != 0 && a != 1) + *overflow = 1; + return result; + } + di_int sa = a >> (N - 1); + di_int abs_a = (a ^ sa) - sa; + di_int sb = b >> (N - 1); + di_int abs_b = (b ^ sb) - sb; + if (abs_a < 2 || abs_b < 2) + return result; + if (sa == sb) + { + if (abs_a > MAX / abs_b) + *overflow = 1; + } + else + { + if (abs_a > MIN / -abs_b) + *overflow = 1; + } + return result; +}

1 0

[tor/master] Merge branch 'link_ftrapv_clang32'
by nickm＠torproject.org 20 May '16

20 May '16

commit 649785d464371f295405ced647b7b10f59053330 Merge: 4a14c2c ae7e2b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 16:01:35 2016 -0400 Merge branch 'link_ftrapv_clang32' LICENSE | 104 +++++++++++++++++++++++++++++++++++++++++++++ changes/bug19079 | 4 ++ configure.ac | 40 +++++++++++++++++ src/common/include.am | 7 +++ src/ext/README | 7 +++ src/ext/mulodi/LICENSE.TXT | 91 +++++++++++++++++++++++++++++++++++++++ src/ext/mulodi/mulodi4.c | 64 ++++++++++++++++++++++++++++ 7 files changed, 317 insertions(+)

1 0

[tor/master] Include __mulodi4 in libor_ctime when it fixes clang -m32 -ftrapv
by nickm＠torproject.org 20 May '16

20 May '16

commit 6d6c8287d5e060117bfa066f87d4e2fc08ab708d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 18 09:44:05 2016 -0400 Include __mulodi4 in libor_ctime when it fixes clang -m32 -ftrapv We use a pretty specific pair of autoconf tests here to make sure that we only add this code when: a) a 64-bit signed multiply fails to link, AND b) the same 64-bit signed multiply DOES link correctly when __mulodi4 is defined. Closes ticket 19079. --- changes/bug19079 | 4 ++++ configure.ac | 40 ++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 7 +++++++ 3 files changed, 51 insertions(+) diff --git a/changes/bug19079 b/changes/bug19079 new file mode 100644 index 0000000..6cbc6ce --- /dev/null +++ b/changes/bug19079 @@ -0,0 +1,4 @@ + o Minor features (build): + - Detect and work around a libclang_rt problem that prevents clang from + finding __mulodi4() on some 32-bit platforms. This clang bug would keep + -ftrapv from linking on those systems. Closes ticket 19079. diff --git a/configure.ac b/configure.ac index de59c75..8465b43 100644 --- a/configure.ac +++ b/configure.ac @@ -801,6 +801,46 @@ fi CFLAGS_BUGTRAP="$CFLAGS_FTRAPV $CFLAGS_ASAN $CFLAGS_UBSAN" CFLAGS_CONSTTIME="$CFLAGS_FWRAPV" +if test "$have_clang" = "yes"; then + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $CFLAGS_FTRAPV" + AC_MSG_CHECKING([whether clang -ftrapv can link a 64-bit int multiply]) + AC_LINK_IFELSE([ + AC_LANG_SOURCE([[ + #include <stdint.h> + #include <stdlib.h> + int main(int argc, char **argv) + { + int64_t x = ((int64_t)atoi(argv[1])) * (int64_t)atoi(argv[2]) + * (int64_t)argv[3]; + return x == 9; + } ]])], + [ftrapv_can_link=yes; AC_MSG_RESULT([yes])], + [ftrapv_can_link=no; AC_MSG_RESULT([no])]) + mulodi_fixes_ftrapv=no + if test "$ftrapv_can_link" = "no"; then + AC_MSG_CHECKING([whether defining __mulodi4 fixes that]) + AC_LINK_IFELSE([ + AC_LANG_SOURCE([[ + #include <stdint.h> + #include <stdlib.h> + int64_t __mulodi4(int64_t a, int64_t b, int *overflow) { + *overflow=0; + return a; + } + int main(int argc, char **argv) + { + int64_t x = ((int64_t)atoi(argv[1])) * (int64_t)atoi(argv[2]) + * (int64_t)argv[3]; + return x == 9; + } ]])], + [mulodi_fixes_ftrapv=yes; AC_MSG_RESULT([yes])], + [mulodi_fixes_ftrapv=no; AC_MSG_RESULT([no])]) + fi + AM_CONDITIONAL(ADD_MULODI4, test "$mulodi_fixes_ftrapv" = "yes") + CFLAGS="$saved_CFLAGS" +fi + dnl These cflags add bunches of branches, and we haven't been able to dnl persuade ourselves that they're suitable for code that needs to be dnl constant time. diff --git a/src/common/include.am b/src/common/include.am index c39ad8d..222afe0 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -62,7 +62,14 @@ else readpassphrase_source= endif +if ADD_MULODI4 +mulodi4_source=src/ext/mulodi/mulodi4.c +else +mulodi4_source= +endif + LIBOR_CTIME_A_SRC = \ + $(mulodi4_source) \ src/ext/csiphash.c \ src/common/di_ops.c

1 0

[tor/master] add missing atoi for cosmetic reasons
by nickm＠torproject.org 20 May '16

20 May '16

commit ae7e2b9a7cd95ad04d3d416fd58cc20f8c4f06bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 16:01:25 2016 -0400 add missing atoi for cosmetic reasons --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8465b43..f8cad48 100644 --- a/configure.ac +++ b/configure.ac @@ -812,7 +812,7 @@ if test "$have_clang" = "yes"; then int main(int argc, char **argv) { int64_t x = ((int64_t)atoi(argv[1])) * (int64_t)atoi(argv[2]) - * (int64_t)argv[3]; + * (int64_t)atoi(argv[3]); return x == 9; } ]])], [ftrapv_can_link=yes; AC_MSG_RESULT([yes])], @@ -831,7 +831,7 @@ if test "$have_clang" = "yes"; then int main(int argc, char **argv) { int64_t x = ((int64_t)atoi(argv[1])) * (int64_t)atoi(argv[2]) - * (int64_t)argv[3]; + * (int64_t)atoi(argv[3]); return x == 9; } ]])], [mulodi_fixes_ftrapv=yes; AC_MSG_RESULT([yes])],

1 0

[tor/master] whitespace fixes
by nickm＠torproject.org 20 May '16

20 May '16

commit 2729f166cb715f0f4aff8779f0fadebafc56a70c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 20:08:03 2016 -0400 whitespace fixes --- src/or/dirserv.c | 5 +++-- src/or/router.c | 15 ++++++++------- src/or/routerlist.c | 3 ++- src/or/routerparse.c | 7 ++++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c97e3bc..dafaed8 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -261,7 +261,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, /* This has an ed25519 identity key. */ if (KEYPIN_MISMATCH == keypin_check((const uint8_t*)router->cache_info.identity_digest, - router->cache_info.signing_key_cert->signing_key.pubkey)) { + router->cache_info.signing_key_cert->signing_key.pubkey)) { log_fn(severity, LD_DIR, "Descriptor from router %s has an Ed25519 key, " "but the <rsa,ed25519> keys don't match what they were before.", @@ -2898,7 +2898,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, listbadexits); if (ri->cache_info.signing_key_cert) { - memcpy(vrs->ed25519_id, ri->cache_info.signing_key_cert->signing_key.pubkey, + memcpy(vrs->ed25519_id, + ri->cache_info.signing_key_cert->signing_key.pubkey, ED25519_PUBKEY_LEN); } diff --git a/src/or/router.c b/src/or/router.c index 772a855..aa4acf6 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2036,7 +2036,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) routerinfo_free(ri); return -1; } - ri->cache_info.signing_key_cert = tor_cert_dup(get_master_signing_key_cert()); + ri->cache_info.signing_key_cert = + tor_cert_dup(get_master_signing_key_cert()); get_platform_str(platform, sizeof(platform)); ri->platform = tor_strdup(platform); @@ -2560,9 +2561,9 @@ router_dump_router_to_string(routerinfo_t *router, char ed_cert_base64[256]; char ed_fp_base64[ED25519_BASE64_LEN+1]; if (base64_encode(ed_cert_base64, sizeof(ed_cert_base64), - (const char*)router->cache_info.signing_key_cert->encoded, - router->cache_info.signing_key_cert->encoded_len, - BASE64_ENCODE_MULTILINE) < 0) { + (const char*)router->cache_info.signing_key_cert->encoded, + router->cache_info.signing_key_cert->encoded_len, + BASE64_ENCODE_MULTILINE) < 0) { log_err(LD_BUG,"Couldn't base64-encode signing key certificate!"); goto err; } @@ -2600,9 +2601,9 @@ router_dump_router_to_string(routerinfo_t *router, int tap_cc_len = 0; uint8_t *tap_cc = make_tap_onion_key_crosscert(tap_key, - &router->cache_info.signing_key_cert->signing_key, - router->identity_pkey, - &tap_cc_len); + &router->cache_info.signing_key_cert->signing_key, + router->identity_pkey, + &tap_cc_len); if (!tap_cc) { log_warn(LD_BUG,"make_tap_onion_key_crosscert failed!"); goto err; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2634e0d..f9247cb 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5215,7 +5215,8 @@ routerinfo_incompatible_with_extrainfo(const crypto_pk_t *identity_pkey, goto err; /* different servers */ } - if (! tor_cert_opt_eq(sd->signing_key_cert,ei->cache_info.signing_key_cert)) { + if (! tor_cert_opt_eq(sd->signing_key_cert, + ei->cache_info.signing_key_cert)) { if (msg) *msg = "Extrainfo signing key cert didn't match routerinfo"; goto err; /* different servers */ } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a7c29aa..91025c1 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1405,7 +1405,8 @@ router_parse_entry_from_string(const char *s, const char *end, log_warn(LD_DIR, "Couldn't parse ed25519 cert"); goto err; } - router->cache_info.signing_key_cert = cert; /* makes sure it gets freed.*/ + /* makes sure it gets freed. */ + router->cache_info.signing_key_cert = cert; if (cert->cert_type != CERT_TYPE_ID_SIGNING || ! cert->signing_key_included) { @@ -1600,8 +1601,8 @@ router_parse_entry_from_string(const char *s, const char *end, } if (tok->n_args >= 2) { - if (digest256_from_base64(router->cache_info.extra_info_digest256, tok->args[1]) - < 0) { + if (digest256_from_base64(router->cache_info.extra_info_digest256, + tok->args[1]) < 0) { log_warn(LD_DIR, "Invalid extra info digest256 %s", escaped(tok->args[1])); }

1 0

[tor/master] lintchanges on 18809, and fix the bug number
by nickm＠torproject.org 20 May '16

20 May '16

commit dd17df2253fb0592ed3f75f8cf5134b71800df62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:54:19 2016 -0400 lintchanges on 18809, and fix the bug number --- changes/bug18809 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/bug18809 b/changes/bug18809 index 94e6369..1e15187 100644 --- a/changes/bug18809 +++ b/changes/bug18809 @@ -3,12 +3,14 @@ when the linked connection attaches. This prevents tor making unnecessary begindir-style connections, which are the only directory connections tor clients make since - #18483 was merged. + the fix for 18483 was merged. - Fix some edge cases where consensus download connections may not have been closed, even though they were not needed. + Related to fix 18809. - Make relays retry consensus downloads the correct number of times, rather than the more aggressive client retry count. + Fixes part of ticket 18809. - Stop downloading consensuses when we have a consensus, even if we don't have all the certificates for it yet. - Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha, - patches by arma and teor. + Fixes bug 18809; bugfix on 0.2.8.1-alpha. + Patches by arma and teor.

1 0