diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-01-11 14:37:29 -0500 |
| commit | d1f474160638e10478a2ab14fb93b1e8b6a720a2 (patch) | |
| tree | ad9b071ad1afc24b6083d80ea0a355026a260736 /src/core/or/channeltls.c | |
| parent | edc9fda4f5ba6f1d04ec239e77aca273f8c6701b (diff) | |
| parent | 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 (diff) | |
| download | tor-d1f474160638e10478a2ab14fb93b1e8b6a720a2.tar.gz tor-d1f474160638e10478a2ab14fb93b1e8b6a720a2.zip | |
Merge branch 'maint-0.4.4' into maint-0.4.5
Diffstat (limited to 'src/core/or/channeltls.c')
| -rw-r--r-- | src/core/or/channeltls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index b6fdbcc632..846e6e5f42 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1248,8 +1248,9 @@ channel_tls_handle_var_cell(var_cell_t *var_cell, or_connection_t *conn) * the v2 and v3 handshakes. */ /* But that should be happening any longer've disabled bufferevents. */ tor_assert_nonfatal_unreached_once(); - +#ifndef ALL_BUGS_ARE_FATAL FALLTHROUGH; +#endif case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: if (!(command_allowed_before_handshake(var_cell->command))) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, |