- tor-commits - lists.torproject.org

[tor/maint-0.4.2] Replace some "fall through" comments not at the end of a case.
by nickm＠torproject.org 06 May '20

06 May '20

commit 9fe23b8672fdc4da64a99acf55b47193375b9562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:35:36 2020 -0400 Replace some "fall through" comments not at the end of a case. --- src/core/proto/proto_socks.c | 5 ++++- src/feature/relay/dns.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 8b78ed44c..a6493366e 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -1067,7 +1067,10 @@ parse_socks_client(const uint8_t *data, size_t datalen, log_info(LD_NET, "SOCKS 5 client: need authentication."); *drain_out = -1; return 2; - /* fall through */ + default: + /* This wasn't supposed to be exhaustive; there are other + * authentication methods too. */ + ; } *reason = tor_strdup("server doesn't support any of our available " diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index cc9f4cf49..38395862c 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -546,7 +546,7 @@ send_resolved_cell,(edge_connection_t *conn, uint8_t answer_type, break; } else { answer_type = RESOLVED_TYPE_ERROR; - /* fall through. */ + /* We let this fall through and treat it as an error. */ } /* Falls through. */ case RESOLVED_TYPE_ERROR_TRANSIENT:

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4 Merge: 104130609 78a72f819 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1

1 0

[tor/maint-0.4.2] Replace a "fall through" comment that was outside a switch.
by nickm＠torproject.org 06 May '20

06 May '20

commit 75547c01a37c65398f8d31ee9cb38d865119cd28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:32:35 2020 -0400 Replace a "fall through" comment that was outside a switch. --- src/feature/dirauth/keypin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/dirauth/keypin.c b/src/feature/dirauth/keypin.c index 667feb2c0..06cb9ba1f 100644 --- a/src/feature/dirauth/keypin.c +++ b/src/feature/dirauth/keypin.c @@ -267,7 +267,7 @@ keypin_add_or_replace_entry_in_map(keypin_ent_t *ent) } tor_free(ent2); r = -1; - /* Fall through */ + /* Note lack of return here: we fall through to the next line. */ } keypin_add_entry_to_map(ent);

1 0

[tor/maint-0.4.1] Merge branch 'bug34078_prelim_041' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 1041306092e978f6b028693e7893470bff1c61f9 Merge: a02e86664 3e42464f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:46:52 2020 -0400 Merge branch 'bug34078_prelim_041' into maint-0.4.1 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.2] include compat_compiler for ed25519_donna
by nickm＠torproject.org 06 May '20

06 May '20

commit 37b8324ed3147e184567ab23ac507ba68837093d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:38:59 2020 -0400 include compat_compiler for ed25519_donna --- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ext/ed25519/donna/ed25519_tor.c b/src/ext/ed25519/donna/ed25519_tor.c index 7f5ab398d..a5bb6f4e2 100644 --- a/src/ext/ed25519/donna/ed25519_tor.c +++ b/src/ext/ed25519/donna/ed25519_tor.c @@ -35,6 +35,9 @@ #define ED25519_FN(fn) ED25519_FN2(fn,ED25519_SUFFIX) #include "orconfig.h" + +#include "lib/cc/compat_compiler.h" + #include "ed25519-donna.h" #include "ed25519_donna_tor.h" #include "ed25519-randombytes.h" @@ -366,4 +369,3 @@ ed25519_donna_scalarmult_with_group_order(unsigned char *out, } #include "test-internals.c" -

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4 Merge: 104130609 78a72f819 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 May '20

06 May '20

commit d04b708b4bd47ee8df6796f19b25f558b2b18e91 Merge: bbfc498e2 28f453c47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.3] Add a fallthrough macro.
by nickm＠torproject.org 06 May '20

06 May '20

commit 6c3c94357c196681ceda773425e18161da8cfdef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:24:21 2020 -0400 Add a fallthrough macro. This macro defers to __attribute__((fallthrough)) on GCC (and clang). Previously we had been using GCC's magic /* fallthrough */ comments, but clang very sensibly doesn't accept those. Since not all compiler recognize it, we only define it when our configure script detects that it works. Part of a fix for 34078. --- configure.ac | 16 ++++++++++++++++ src/lib/cc/compat_compiler.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/configure.ac b/configure.ac index bc434ed83..a441162f4 100644 --- a/configure.ac +++ b/configure.ac @@ -356,6 +356,22 @@ if test "$tor_cv_c_c99_designated_init" != "yes"; then AC_MSG_ERROR([Your compiler doesn't support c99 designated initializers. This is required as of Tor 0.2.6.x]) fi +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +AC_CACHE_CHECK([for __attribute__((fallthrough))], + tor_cv_c_attr_fallthrough, + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([extern int x; void fn(void) ;], + [[ switch (x) { case 1: fn(); __attribute__((fallthrough)); + case 2: fn(); break; } ]])], + [tor_cv_c_attr_fallthrough=yes], + [tor_cv_c_attr_fallthrough=no] )]) +CFLAGS="$saved_CFLAGS" + +if test "$tor_cv_c_attr_fallthrough" == "yes"; then + AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) +fi + TORUSER=_tor AC_ARG_WITH(tor-user, AS_HELP_STRING(--with-tor-user=NAME, [specify username for tor daemon]), diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 3a0f30718..fbe6a38f1 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -50,6 +50,12 @@ #define CHECK_SCANF(formatIdx, firstArg) #endif /* defined(__GNUC__) */ +#if defined(HAVE_ATTR_FALLTHROUGH) +#define FALLTHROUGH __attribute__((fallthrough)) +#else +#define FALLTHROUGH +#endif + /* What GCC do we have? */ #ifdef __GNUC__ #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)

1 0

[tor/maint-0.4.2] Merge branch 'bug34078_prelim_041' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 1041306092e978f6b028693e7893470bff1c61f9 Merge: a02e86664 3e42464f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:46:52 2020 -0400 Merge branch 'bug34078_prelim_041' into maint-0.4.1 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.2] Remove an incorrect "Fall through" comment.
by nickm＠torproject.org 06 May '20

06 May '20

commit 3d3641152b5d8a4bf8587dec640bda3d440b7c36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 14:47:38 2020 -0400 Remove an incorrect "Fall through" comment. --- src/lib/crypt_ops/crypto_digest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c index 26f06c6c7..1b2724b2a 100644 --- a/src/lib/crypt_ops/crypto_digest.c +++ b/src/lib/crypt_ops/crypto_digest.c @@ -100,7 +100,7 @@ library_supports_digest(digest_algorithm_t alg) switch (alg) { case DIGEST_SHA1: /* Fall through */ case DIGEST_SHA256: /* Fall through */ - case DIGEST_SHA512: /* Fall through */ + case DIGEST_SHA512: return true; case DIGEST_SHA3_256: /* Fall through */ case DIGEST_SHA3_512: /* Fall through */

1 0