nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expect a 20-byte nul-padded-and-terminated nickname

Browse Source 
svn:r1480
This commit is contained in:
Nick Mathewson 2004-04-05 17:28:48 +00:00
parent 1e2b008700
commit 41387bea08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/rendservice.c
View File

@ -326,7 +326,7 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len)
return -1; return -1;
} }
/* min key length plus digest length */ /* min key length plus digest length plus nickname length */
if (request_len < 148) { if (request_len < 148) {
log_fn(LOG_WARN, "Got a truncated INTRODUCE2 cell on circ %d", log_fn(LOG_WARN, "Got a truncated INTRODUCE2 cell on circ %d",
circuit->n_circ_id); circuit->n_circ_id);
@ -357,9 +357,9 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len)
log_fn(LOG_WARN, "Couldn't decrypt INTRODUCE2 cell"); log_fn(LOG_WARN, "Couldn't decrypt INTRODUCE2 cell");
return -1; return -1;
} }
ptr=memchr(buf,0,len); ptr=memchr(buf,0,MAX_NICKNAME_LEN+1);
if (!ptr || ptr == buf) { if (!ptr || ptr == buf) {
log_fn(LOG_WARN, "Couldn't find a null-terminated nickname in INTRODUCE2 cell"); log_fn(LOG_WARN, "Couldn't find a null-padded nickname in INTRODUCE2 cell");
return -1; return -1;
} }
if (strspn(buf,LEGAL_NICKNAME_CHARACTERS) != ptr-buf) { if (strspn(buf,LEGAL_NICKNAME_CHARACTERS) != ptr-buf) {
@ -368,8 +368,8 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len)
} }
/* Okay, now we know that the nickname is at the start of the buffer. */ /* Okay, now we know that the nickname is at the start of the buffer. */
rp_nickname = buf; rp_nickname = buf;
++ptr; ptr = buf+(MAX_NICKNAME_LEN+1);
len -= (ptr-buf); len -= (MAX_NICKNAME_LEN+1);
if (len != 20+128) { if (len != 20+128) {
log_fn(LOG_WARN, "Bad length for INTRODUCE2 cell."); log_fn(LOG_WARN, "Bad length for INTRODUCE2 cell.");
return -1; return -1;