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

Verify that router fingerprint lines match identity keys. (We dont use them, but others might.)

Browse Source 
svn:r5389
This commit is contained in:
Nick Mathewson 2005-11-15 21:24:32 +00:00
parent 74d1ca66c0
commit 22aea0757e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/or/routerparse.c
View File

@ -135,7 +135,7 @@ static struct {
{ "dir-signing-key", K_DIR_SIGNING_KEY, ARGS, OBJ_OK, { "dir-signing-key", K_DIR_SIGNING_KEY, ARGS, OBJ_OK,
DIR|NETSTATUS}, DIR|NETSTATUS},
{ "family", K_FAMILY, ARGS, NO_OBJ, RTR }, { "family", K_FAMILY, ARGS, NO_OBJ, RTR },
{ "fingerprint", K_FINGERPRINT, ARGS, NO_OBJ, ANYSIGNED }, { "fingerprint", K_FINGERPRINT, CONCAT_ARGS, NO_OBJ, ANYSIGNED },
{ "hibernating", K_HIBERNATING, ARGS, NO_OBJ, RTR }, { "hibernating", K_HIBERNATING, ARGS, NO_OBJ, RTR },
{ "read-history", K_READ_HISTORY, ARGS, NO_OBJ, RTR }, { "read-history", K_READ_HISTORY, ARGS, NO_OBJ, RTR },
{ "write-history", K_WRITE_HISTORY, ARGS, NO_OBJ, RTR }, { "write-history", K_WRITE_HISTORY, ARGS, NO_OBJ, RTR },
@ -851,6 +851,25 @@ router_parse_entry_from_string(const char *s, const char *end)
warn(LD_DIR, "Couldn't calculate key digest"); goto err; warn(LD_DIR, "Couldn't calculate key digest"); goto err;
} }
if ((tok = find_first_by_keyword(tokens, K_FINGERPRINT))) {
/* If there's a fingerprint line, it must match the identity digest. */
char d[DIGEST_LEN];
if (tok->n_args < 1) {
warn(LD_DIR, "Too few arguments to fingerprint");
goto err;
}
tor_strstrip(tok->args[0], " ");
if (base16_decode(d, DIGEST_LEN, tok->args[0], strlen(tok->args[0]))) {
warn(LD_DIR, "Couldn't decode fingerprint '%s'", tok->args[0]);
goto err;
}
if (memcmp(d,router->cache_info.identity_digest, DIGEST_LEN)!=0) {
warn(LD_DIR, "Fingerprint '%s' does not match identity digest.",
tok->args[0]);
goto err;
}
}
if ((tok = find_first_by_keyword(tokens, K_PLATFORM))) { if ((tok = find_first_by_keyword(tokens, K_PLATFORM))) {
router->platform = tor_strdup(tok->args[0]); router->platform = tor_strdup(tok->args[0]);
} }