nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make directories get generated properly again; debug key lookup. Also, it is hard to find entries in a table when you never put them there.

Browse Source 
svn:r2462
This commit is contained in:
Nick Mathewson 2004-10-13 18:28:39 +00:00
parent 918ce7a084
commit df3098367c
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -1096,6 +1096,8 @@ static int parse_dir_server_line(const char *line)
log_fn(LOG_WARN, "Unable to decode DirServer key digest."); goto err; log_fn(LOG_WARN, "Unable to decode DirServer key digest."); goto err;
} }
log_fn(LOG_DEBUG, "Trusted dirserver at %s:%d (%s)", address,(int)port,
(char*)smartlist_get(items,1));
add_trusted_dir_server(address, port, digest); add_trusted_dir_server(address, port, digest);
r = 0; r = 0;

1
src/or/routerlist.c
View File

@ -1159,6 +1159,7 @@ void add_trusted_dir_server(const char *addr, uint16_t port, const char *digest)
ent->dir_port = port; ent->dir_port = port;
ent->is_running = 1; ent->is_running = 1;
memcpy(ent->digest, digest, DIGEST_LEN); memcpy(ent->digest, digest, DIGEST_LEN);
smartlist_add(trusted_dir_servers, ent);
} }
static void clear_trusted_dir_servers(void) static void clear_trusted_dir_servers(void)

14
src/or/routerparse.c
View File

@ -610,6 +610,8 @@ static int check_directory_signature(const char *digest,
{ {
char signed_digest[PK_BYTES]; char signed_digest[PK_BYTES];
routerinfo_t *r; routerinfo_t *r;
crypto_pk_env_t *_pkey = NULL;
if (tok->n_args != 1) { if (tok->n_args != 1) {
log_fn(LOG_WARN, "Too many or too few arguments to directory-signature"); log_fn(LOG_WARN, "Too many or too few arguments to directory-signature");
@ -618,14 +620,16 @@ static int check_directory_signature(const char *digest,
if (declared_key) { if (declared_key) {
if (dir_signing_key_is_trusted(declared_key)) if (dir_signing_key_is_trusted(declared_key))
pkey = declared_key; _pkey = declared_key;
} else { }
if (!_pkey) {
r = router_get_by_nickname(tok->args[0]); r = router_get_by_nickname(tok->args[0]);
log_fn(LOG_DEBUG, "Got directory signed by %s", tok->args[0]); log_fn(LOG_DEBUG, "Got directory signed by %s", tok->args[0]);
if (r && r->is_trusted_dir) { if (r && r->is_trusted_dir) {
pkey = r->identity_pkey; _pkey = r->identity_pkey;
} else if (!r && pkey) { } else if (!r && pkey) {
/* pkey provided for debugging purposes. */ /* pkey provided for debugging purposes. */
_pkey = pkey;
} else if (!r) { } else if (!r) {
log_fn(LOG_WARN, "Directory was signed by unrecognized server %s", log_fn(LOG_WARN, "Directory was signed by unrecognized server %s",
tok->args[0]); tok->args[0]);
@ -642,9 +646,9 @@ static int check_directory_signature(const char *digest,
return -1; return -1;
} }
tor_assert(pkey); tor_assert(_pkey);
if (crypto_pk_public_checksig(pkey, tok->object_body, 128, signed_digest) if (crypto_pk_public_checksig(_pkey, tok->object_body, 128, signed_digest)
!= 20) { != 20) {
log_fn(LOG_WARN, "Error reading directory: invalid signature."); log_fn(LOG_WARN, "Error reading directory: invalid signature.");
return -1; return -1;