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 | 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 (patch) | |
| tree | 76e9f3eba8dab735e217553ad93052cbdad8a766 /src/core/or/channeltls.c | |
| parent | 77bb4b0838da1d1c1cb7d2d47b02954abeb00a21 (diff) | |
| parent | 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b (diff) | |
| download | tor-5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2.tar.gz tor-5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
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 56552f0095..bbb970b8a6 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1226,8 +1226,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, |