diff options
author | Nick Mathewson <nickm@torproject.org> | 2004-08-07 01:03:33 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2004-08-07 01:03:33 +0000 |
commit | 380f32f07db89b94a93f755af9a5a77b81b9dab9 (patch) | |
tree | 6c506b4055da8369dd6ccf079a84ebb13d50c3e0 /src/or | |
parent | 9952b37456c03b09e5768aaf7e3cf8baa2353d84 (diff) | |
download | tor-380f32f07db89b94a93f755af9a5a77b81b9dab9.tar tor-380f32f07db89b94a93f755af9a5a77b81b9dab9.tar.gz |
hex_encode is obsoleted by base16_encode, and never actually worked in the first place. (Thanks to Timo Lindfors for noticing the never-actually-worked part.)
svn:r2175
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/rendmid.c | 4 | ||||
-rw-r--r-- | src/or/rendservice.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 6c2b37295..cc5045b2a 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -208,7 +208,7 @@ rend_mid_establish_rendezvous(circuit_t *circ, const char *request, int request_ memcpy(circ->rend_cookie, request, REND_COOKIE_LEN); - hex_encode(request,4,hexid); + base16_encode(hexid,9,request,4); log_fn(LOG_INFO, "Established rendezvous point on circuit %d for cookie %s", circ->p_circ_id, hexid); @@ -230,7 +230,7 @@ rend_mid_rendezvous(circuit_t *circ, const char *request, int request_len) char hexid[9]; if (request_len>=4) { - hex_encode(request,4,hexid); + base16_encode(hexid,9,request,4); log_fn(LOG_INFO, "Got request for rendezvous from circuit %d to cookie %s", circ->p_circ_id, hexid); } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ff25704f3..836f119e2 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -417,7 +417,7 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len) return -1; } r_cookie = ptr; - hex_encode(r_cookie,4,hexcookie); + base16_encode(hexcookie,9,r_cookie,4); /* Try DH handshake... */ dh = crypto_dh_new(); @@ -637,7 +637,7 @@ rend_service_rendezvous_has_opened(circuit_t *circuit) hop = circuit->build_state->pending_final_cpath; tor_assert(hop); - hex_encode(circuit->rend_cookie, 4, hexcookie); + base16_encode(hexcookie,9,circuit->rend_cookie,4); base32_encode(serviceid, REND_SERVICE_ID_LEN+1, circuit->rend_pk_digest,10); |