- tor-commits - lists.torproject.org

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

19 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 19 May '16

19 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 19 May '16

19 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 19 May '16

19 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 19 May '16

19 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

[tor/release-0.2.8] Merge remote-tracking branch 'public/bug19073' into maint-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 Merge: dd17df2 2729f16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 15:56:31 2016 -0400 Merge remote-tracking branch 'public/bug19073' into maint-0.2.8 src/or/dirserv.c | 17 +++++++------- src/or/dirvote.c | 7 +++--- src/or/or.h | 6 ----- src/or/router.c | 57 ++++++++++++++++++++++++----------------------- src/or/routerlist.c | 5 ++--- src/or/routerparse.c | 15 +++++++------ src/test/test_dir.c | 9 ++++---- src/test/test_microdesc.c | 2 +- 8 files changed, 58 insertions(+), 60 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 19 May '16

19 May '16

commit 4a14c2cfc7972db39da4fd3a72cfd64d036daf7b Merge: a7a44f2 0d6f293 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 15:56:39 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 8 ++++--- src/or/dirserv.c | 17 +++++++------- src/or/dirvote.c | 7 +++--- src/or/or.h | 6 ----- src/or/router.c | 57 ++++++++++++++++++++++++----------------------- src/or/routerlist.c | 5 ++--- src/or/routerparse.c | 15 +++++++------ src/test/test_dir.c | 9 ++++---- src/test/test_microdesc.c | 2 +- 9 files changed, 63 insertions(+), 63 deletions(-)

1 0

[tor/release-0.2.8] whitespace fixes
by nickm＠torproject.org 19 May '16

19 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] Merge remote-tracking branch 'public/bug19073' into maint-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 Merge: dd17df2 2729f16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 15:56:31 2016 -0400 Merge remote-tracking branch 'public/bug19073' into maint-0.2.8 src/or/dirserv.c | 17 +++++++------- src/or/dirvote.c | 7 +++--- src/or/or.h | 6 ----- src/or/router.c | 57 ++++++++++++++++++++++++----------------------- src/or/routerlist.c | 5 ++--- src/or/routerparse.c | 15 +++++++------ src/test/test_dir.c | 9 ++++---- src/test/test_microdesc.c | 2 +- 8 files changed, 58 insertions(+), 60 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit 945aa9931112c02f5e50594915509b471897684c Merge: 2b8ba55 0d6f293 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 15:56:45 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/dirserv.c | 17 +++++++------- src/or/dirvote.c | 7 +++--- src/or/or.h | 6 ----- src/or/router.c | 57 ++++++++++++++++++++++++----------------------- src/or/routerlist.c | 5 ++--- src/or/routerparse.c | 15 +++++++------ src/test/test_dir.c | 9 ++++---- src/test/test_microdesc.c | 2 +- 8 files changed, 58 insertions(+), 60 deletions(-)

1 0