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

Remove obsolete link-key keyword

Browse Source 
svn:r2186
This commit is contained in:
Nick Mathewson 2004-08-07 03:37:36 +00:00
parent 1ada52fe87
commit 05e9a2269c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/routerparse.c
View File

@ -29,7 +29,6 @@ typedef enum {
K_SIGNED_DIRECTORY, K_SIGNED_DIRECTORY,
K_SIGNING_KEY, K_SIGNING_KEY,
K_ONION_KEY, K_ONION_KEY,
K_LINK_KEY, /* XXXX obsolete; remove in June. */
K_ROUTER_SIGNATURE, K_ROUTER_SIGNATURE,
K_PUBLISHED, K_PUBLISHED,
K_RUNNING_ROUTERS, K_RUNNING_ROUTERS,
@ -102,7 +101,6 @@ static struct {
{ "signed-directory", K_SIGNED_DIRECTORY, NO_ARGS, NO_OBJ, DIR_ONLY }, { "signed-directory", K_SIGNED_DIRECTORY, NO_ARGS, NO_OBJ, DIR_ONLY },
{ "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY,RTR_ONLY }, { "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY,RTR_ONLY },
{ "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY,RTR_ONLY }, { "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY,RTR_ONLY },
{ "link-key", K_LINK_KEY, NO_ARGS, NEED_KEY,RTR_ONLY },
{ "router-signature", K_ROUTER_SIGNATURE, NO_ARGS, NEED_OBJ,RTR_ONLY }, { "router-signature", K_ROUTER_SIGNATURE, NO_ARGS, NEED_OBJ,RTR_ONLY },
{ "running-routers", K_RUNNING_ROUTERS, ARGS, NO_OBJ, DIR_ONLY }, { "running-routers", K_RUNNING_ROUTERS, ARGS, NO_OBJ, DIR_ONLY },
{ "ports", K_PORTS, ARGS, NO_OBJ, RTR_ONLY }, { "ports", K_PORTS, ARGS, NO_OBJ, RTR_ONLY },
@ -757,10 +755,6 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
router->onion_pkey = tok->key; router->onion_pkey = tok->key;
tok->key = NULL; /* Prevent free */ tok->key = NULL; /* Prevent free */
if ((tok = find_first_by_keyword(tokens, K_LINK_KEY))) {
log_fn(LOG_INFO, "Skipping obsolete link-key");
}
if (!(tok = find_first_by_keyword(tokens, K_SIGNING_KEY))) { if (!(tok = find_first_by_keyword(tokens, K_SIGNING_KEY))) {
log_fn(LOG_WARN, "Missing identity key"); goto err; log_fn(LOG_WARN, "Missing identity key"); goto err;
} }