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

It is not the end of the world when a router descriptor has an unrecognized kwd

Browse Source 
svn:r4480
This commit is contained in:
Nick Mathewson 2005-06-24 23:42:15 +00:00
parent c831a9f701
commit b759fe4b8d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/tor-spec.txt
View File

@ -852,9 +852,14 @@ after "directory-signature". This digest is then padded with PKCS.1,
and signed with the directory server's signing key. and signed with the directory server's signing key.
If software encounters an unrecognized keyword in a single router descriptor, If software encounters an unrecognized keyword in a single router descriptor,
it should reject only that router descriptor, and continue using the it MUST reject only that router descriptor, and continue using the
others. If it encounters an unrecognized keyword in the directory header, others. Because this mechanism is used to add 'critical' extensions to
it should reject the entire directory. future versions of the router descriptor format, implementation should treat
it as a normal occurrence and not, for example, report it to the user as an
error. [Versions of Tor prior to 0.1.1 did this.]
If software encounters an unrecognized keyword in the directory header,
it SHOULD reject the entire directory.
7.4. Network-status descriptor 7.4. Network-status descriptor

2
src/or/routerparse.c
View File

@ -853,7 +853,7 @@ router_parse_entry_from_string(const char *s, const char *end)
goto err; goto err;
} }
if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) { if ((tok = find_first_by_keyword(tokens, _UNRECOGNIZED))) {
log_fn(LOG_WARN, "Unrecognized keyword '%s'; skipping descriptor.", log_fn(LOG_INFO, "Unrecognized critical keyword '%s'; skipping descriptor. (It may be from another version of Tor.)",
tok->args[0]); tok->args[0]);
goto err; goto err;
} }