torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.)

Browse Source 
svn:r2175
This commit is contained in:
Nick Mathewson
2004-08-07 01:03:33 +00:00
parent fef5746002
commit 952b5f07fb
4 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/common/util.c
+1 -17
View File
@@ -234,22 +234,6 @@ void set_uint32(char *cp, uint32_t v)
}
#endif
/** Encode the first <b>fromlen</b> bytes stored at <b>from</b> in hexidecimal;
* write the result as a NUL-terminated string to <b>to</b>. <b>to</b> must
* have at least (2*fromlen)+1 bytes of free space.
*/
void hex_encode(const char *from, int fromlen, char *to)
{
const unsigned char *fp = from;
static const char TABLE[] = "0123456789abcdef";
tor_assert(from && fromlen>=0 && to);
while (fromlen--) {
*to++ = TABLE[*fp >> 4];
*to++ = TABLE[*fp & 7];
++fp;
}
*to = '\0';
}
/** Return a pointer to a NUL-terminated hexidecimal string encoding
* the first <b>fromlen</b> bytes of <b>from</b>. (fromlen must be \<= 32.) The
@@ -261,7 +245,7 @@ const char *hex_str(const char *from, int fromlen)
static char buf[65];
if (fromlen>(sizeof(buf)-1)/2)
fromlen = (sizeof(buf)-1)/2;
hex_encode(from,fromlen,buf);
base16_encode(buf,64,from,fromlen);
return buf;
}
trunk/src/common/util.h
-1
View File
@@ -133,7 +133,6 @@ void set_uint32(char *cp, uint32_t v);
#endif
#endif
void hex_encode(const char *from, int fromlen, char *to);
const char *hex_str(const char *from, int fromlen);
/** Generic resizeable array. */
trunk/src/or/rendmid.c
+2 -2
View File
@@ -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);
}
trunk/src/or/rendservice.c
+2 -2
View File
@@ -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);