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

prop289: Skip the first 4 unused bytes in a cell

Browse Source 
When adding random to a cell, skip the first 4 bytes and leave them zeroed. It
has been very useful in the past for us to keep bytes like this.

Some code trickery was added to make sure we have enough room for this 4 bytes
offset when adding random.

Part of #26288

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2019-03-07 12:45:16 -05:00
parent 77d560af64
commit 44750b0de6
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/or/relay.c
View File

@ -547,6 +547,8 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *circ,
cell_t cell; cell_t cell;
relay_header_t rh; relay_header_t rh;
cell_direction_t cell_direction; cell_direction_t cell_direction;
int random_bytes_len;
size_t random_bytes_offset = 0;
/* XXXX NM Split this function into a separate versions per circuit type? */ /* XXXX NM Split this function into a separate versions per circuit type? */
tor_assert(circ); tor_assert(circ);
@ -575,10 +577,19 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *circ,
/* Add random bytes to the unused portion of the payload, to foil attacks /* Add random bytes to the unused portion of the payload, to foil attacks
* where the other side can predict all of the bytes in the payload and thus * where the other side can predict all of the bytes in the payload and thus
* compute authenticated sendme cells without seeing the traffic. See * compute authenticated sendme cells without seeing the traffic. See
* proposal 289. */ * proposal 289.
*
* We'll skip the first 4 bytes of unused data because having some unused
* zero bytes has saved us a lot of times in the past. */
random_bytes_len = RELAY_PAYLOAD_SIZE -
(RELAY_HEADER_SIZE + payload_len + 4);
if (random_bytes_len < 0) {
random_bytes_len = 0;
}
random_bytes_offset = RELAY_PAYLOAD_SIZE - random_bytes_len;
crypto_fast_rng_getbytes(get_thread_fast_rng(), crypto_fast_rng_getbytes(get_thread_fast_rng(),
cell.payload + RELAY_HEADER_SIZE + payload_len, cell.payload + random_bytes_offset,
RELAY_PAYLOAD_SIZE - payload_len); random_bytes_len);
log_debug(LD_OR,"delivering %d cell %s.", relay_command, log_debug(LD_OR,"delivering %d cell %s.", relay_command,
cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward"); cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward");