nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure router descriptor doesnt eat the directory-signature

Browse Source 
svn:r516
This commit is contained in:
Nick Mathewson 2003-09-30 20:04:40 +00:00
parent f0e94dab86
commit 1cd57b8466
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/dirserv.c
View File

@ -198,9 +198,10 @@ dirserv_add_descriptor(const char **desc)
log(LOG_WARNING, "no descriptor found.");
goto err;
}
end = strstr(start+6, "\nrouter ");
if (end) {
if ((end = strstr(start+6, "\nrouter "))) {
++end; /* Include NL. */
} else if ((end = strstr(start+6, "\ndirectory-signature"))) {
++end;
} else {
end = start+strlen(start);
}
@ -336,6 +337,9 @@ dirserv_dump_directory_to_string(char *s, int maxlen,
log_fn(LOG_WARNING,"couldn't sign digest");
return -1;
}
log(LOG_DEBUG,"generated directory digest begins with %02x:%02x:%02x:%02x",
((int)digest[0])&0xff,((int)digest[1])&0xff,
((int)digest[2])&0xff,((int)digest[3])&0xff);
strncpy(cp,
"-----BEGIN SIGNATURE-----\n", maxlen-i);