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

Thats the letter I and the number 2. (Apologies to Negativland)

Browse Source 
svn:r279
This commit is contained in:
Nick Mathewson 2003-05-09 01:04:58 +00:00
parent 22df330f14
commit 39314a13b0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/main.c
View File

@ -696,11 +696,12 @@ int
dump_signed_directory_to_string_impl(char *s, int maxlen, directory_t *dir, dump_signed_directory_to_string_impl(char *s, int maxlen, directory_t *dir,
crypto_pk_env_t *private_key) crypto_pk_env_t *private_key)
{ {
char *cp; char *cp, *eos;
char digest[20]; char digest[20];
char signature[128]; char signature[128];
int i, written; int i, written;
routerinfo_t *router; routerinfo_t *router;
eos = s+maxlen;
strncpy(s, strncpy(s,
"signed-directory\n" "signed-directory\n"
"client-software x y z\n" /* XXX make this real */ "client-software x y z\n" /* XXX make this real */
@ -711,14 +712,13 @@ dump_signed_directory_to_string_impl(char *s, int maxlen, directory_t *dir,
cp = s+i; cp = s+i;
for (i = 0; i < dir->n_routers; ++i) { for (i = 0; i < dir->n_routers; ++i) {
router = dir->routers[i]; router = dir->routers[i];
written = dump_router_to_string(cp, maxlen-i, router); written = dump_router_to_string(cp, eos-cp, router);
if(written < 0) { if(written < 0) {
log(LOG_ERR,"dump_signed_directory_to_string(): tried to exceed string length."); log(LOG_ERR,"dump_signed_directory_to_string(): tried to exceed string length.");
cp[maxlen-1] = 0; /* make sure it's null terminated */ cp[maxlen-1] = 0; /* make sure it's null terminated */
return -1; return -1;
} }
i += written;
cp += written; cp += written;
} }

2
src/or/test.c
View File

@ -634,6 +634,8 @@ test_dir_format()
/* puts(buf); */ /* puts(buf); */
test_assert(! router_get_dir_from_string_impl(buf, &dir2, pk1)); test_assert(! router_get_dir_from_string_impl(buf, &dir2, pk1));
test_eq(2, dir2->n_routers);
if (pk1_str) free(pk1_str); if (pk1_str) free(pk1_str);
if (pk2_str) free(pk2_str); if (pk2_str) free(pk2_str);