nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.3' into maint-0.4.4

Browse Source
This commit is contained in:
Nick Mathewson 2021-01-11 14:37:29 -05:00
commit 5a822b462a
5 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/40241 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Fix a compilation warning about unreachable fallthrough annotations
when building with "--enable-all-bugs-are-fatal" on some compilers.
Fixes bug 40241; bugfix on 0.3.5.4-alpha.

3
src/core/or/channeltls.c
View File

@ -1226,8 +1226,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn)
* the v2 and v3 handshakes. */ * the v2 and v3 handshakes. */
/* But that should be happening any longer've disabled bufferevents. */ /* But that should be happening any longer've disabled bufferevents. */
tor_assert_nonfatal_unreached_once(); tor_assert_nonfatal_unreached_once();
#ifndef ALL_BUGS_ARE_FATAL
FALLTHROUGH; FALLTHROUGH;
#endif
case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING:
if (!(command_allowed_before_handshake(var_cell->command))) { if (!(command_allowed_before_handshake(var_cell->command))) {
log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

2
src/core/or/circuitlist.c
View File

@ -846,7 +846,9 @@ circuit_purpose_to_controller_hs_state_string(uint8_t purpose)
"Unrecognized circuit purpose: %d", "Unrecognized circuit purpose: %d",
(int)purpose); (int)purpose);
tor_fragile_assert(); tor_fragile_assert();
#ifndef ALL_BUGS_ARE_FATAL
FALLTHROUGH; FALLTHROUGH;
#endif
case CIRCUIT_PURPOSE_OR: case CIRCUIT_PURPOSE_OR:
case CIRCUIT_PURPOSE_C_GENERAL: case CIRCUIT_PURPOSE_C_GENERAL:

2
src/feature/client/entrynodes.c
View File

@ -2317,7 +2317,9 @@ entry_guards_note_guard_success(guard_selection_t *gs,
break; break;
default: default:
tor_assert_nonfatal_unreached(); tor_assert_nonfatal_unreached();
#ifndef ALL_BUGS_ARE_FATAL
FALLTHROUGH; FALLTHROUGH;
#endif
case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD: case GUARD_CIRC_STATE_USABLE_IF_NO_BETTER_GUARD:
if (guard->is_primary) { if (guard->is_primary) {
/* XXXX #20832 -- I don't actually like this logic. It seems to make /* XXXX #20832 -- I don't actually like this logic. It seems to make

2
src/feature/rend/rendclient.c
View File

@ -831,7 +831,9 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro,
log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.", log_warn(LD_BUG, "Unknown failure type %u. Removing intro point.",
failure_type); failure_type);
tor_fragile_assert(); tor_fragile_assert();
#ifndef ALL_BUGS_ARE_FATAL
FALLTHROUGH; FALLTHROUGH;
#endif
case INTRO_POINT_FAILURE_GENERIC: case INTRO_POINT_FAILURE_GENERIC:
rend_cache_intro_failure_note(failure_type, rend_cache_intro_failure_note(failure_type,
(uint8_t *)failed_intro->identity_digest, (uint8_t *)failed_intro->identity_digest,