diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:00:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 12:00:59 -0500 |
| commit | c5382255bd1f16b718885d4680d28a85d297f117 (patch) | |
| tree | 87cd3bdb912a8958f537af8d3b81fe84aec09c78 /src/or/circuitbuild.c | |
| parent | a1ceee193bf2017bd7d2115cfa1d718409c11929 (diff) | |
| parent | 40ef9087cf7960ce00cd82aa49309f47c9eb064c (diff) | |
| download | tor-c5382255bd1f16b718885d4680d28a85d297f117.tar.gz tor-c5382255bd1f16b718885d4680d28a85d297f117.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 27b28040d7..d4505c29f9 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2077,7 +2077,8 @@ circuit_extend(cell_t *cell, circuit_t *circ) n_addr32 = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE)); n_port = ntohs(get_uint16(cell->payload+RELAY_HEADER_SIZE+4)); onionskin = (char*) cell->payload+RELAY_HEADER_SIZE+4+2; - id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+ONIONSKIN_CHALLENGE_LEN; + id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+ + ONIONSKIN_CHALLENGE_LEN; tor_addr_from_ipv4h(&n_addr, n_addr32); if (!n_port || !n_addr32) { @@ -2232,7 +2233,7 @@ circuit_finish_handshake(origin_circuit_t *circ, uint8_t reply_type, tor_assert(hop->state == CPATH_STATE_AWAITING_KEYS); if (reply_type == CELL_CREATED && hop->dh_handshake_state) { - if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply, keys, + if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply,keys, DIGEST_LEN*2+CIPHER_KEY_LEN*2) < 0) { log_warn(LD_CIRC,"onion_skin_client_handshake failed."); return -END_CIRC_REASON_TORPROTOCOL; |