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

Check router signatures again; debug signature checking

Browse Source 
svn:r517
This commit is contained in:
Nick Mathewson 2003-09-30 20:05:45 +00:00
parent 1cd57b8466
commit 9f0c608b7e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/or/routers.c
View File

@ -655,6 +655,10 @@ int router_get_dir_from_string_impl(char *s, directory_t **dest,
log_fn(LOG_WARNING, "Unable to compute digest of directory"); log_fn(LOG_WARNING, "Unable to compute digest of directory");
goto err; goto err;
} }
log(LOG_DEBUG,"Received directory hashes to %02x:%02x:%02x:%02x",
((int)digest[0])&0xff,((int)digest[1])&0xff,
((int)digest[2])&0xff,((int)digest[3])&0xff);
NEXT_TOK(); NEXT_TOK();
TOK_IS(K_SIGNED_DIRECTORY, "signed-directory"); TOK_IS(K_SIGNED_DIRECTORY, "signed-directory");
@ -702,6 +706,9 @@ int router_get_dir_from_string_impl(char *s, directory_t **dest,
free(tok.val.signature); free(tok.val.signature);
goto err; goto err;
} }
log(LOG_DEBUG,"Signed directory hash starts %02x:%02x:%02x:%02x",
((int)signed_digest[0])&0xff,((int)signed_digest[1])&0xff,
((int)signed_digest[2])&0xff,((int)signed_digest[3])&0xff);
if (memcmp(digest, signed_digest, 20)) { if (memcmp(digest, signed_digest, 20)) {
log_fn(LOG_WARNING, "Error reading directory: signature does not match."); log_fn(LOG_WARNING, "Error reading directory: signature does not match.");
#if 0 /* XXX, fix me */ #if 0 /* XXX, fix me */
@ -830,9 +837,7 @@ router_resolve_directory(directory_t *dir)
*/ */
routerinfo_t *router_get_entry_from_string(char**s) { routerinfo_t *router_get_entry_from_string(char**s) {
routerinfo_t *router = NULL; routerinfo_t *router = NULL;
#if 0
char signed_digest[128]; char signed_digest[128];
#endif
char digest[128]; char digest[128];
directory_token_t _tok; directory_token_t _tok;
directory_token_t *tok = &_tok; directory_token_t *tok = &_tok;
@ -961,9 +966,7 @@ routerinfo_t *router_get_entry_from_string(char**s) {
goto err; goto err;
} }
assert (router->identity_pkey); assert (router->identity_pkey);
#if 0
/* XXX This should get re-enabled, once directory servers properly
* XXX relay signed router blocks. */
if (crypto_pk_public_checksig(router->identity_pkey, tok->val.signature, if (crypto_pk_public_checksig(router->identity_pkey, tok->val.signature,
128, signed_digest) != 20) { 128, signed_digest) != 20) {
log_fn(LOG_WARNING, "Invalid signature"); log_fn(LOG_WARNING, "Invalid signature");
@ -973,7 +976,6 @@ routerinfo_t *router_get_entry_from_string(char**s) {
log_fn(LOG_WARNING, "Mismatched signature"); log_fn(LOG_WARNING, "Mismatched signature");
goto err; goto err;
} }
#endif
return router; return router;