diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:58:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-03 11:58:59 -0500 |
| commit | 66039d98430bfbbc921f386b41366b78579e07f0 (patch) | |
| tree | 35b4b4f71c4c4499cbe6105a5434a3fcb101b30f /src/or/circuitbuild.c | |
| parent | 30b3475e6d5f5b644d4b607b343ff1da9540d178 (diff) | |
| parent | 989db9aed19f0ca3c93a1638bab4a2b473a94aa9 (diff) | |
| download | tor-66039d98430bfbbc921f386b41366b78579e07f0.tar.gz tor-66039d98430bfbbc921f386b41366b78579e07f0.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/routerparse.c
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 d89de38eb3..b1743847c8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2082,7 +2082,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) { @@ -2237,7 +2238,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; |