diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-03-06 18:20:28 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-03-06 18:20:28 +0100 |
| commit | b3918b3bbbfa9097246d63746c8b540eff2ec8e8 (patch) | |
| tree | 7fdc358bb570b1dc5385906d39ee57ef35fd4daa /src | |
| parent | 10ad3442e11fb5a54c19eef7425bc317a9cc0969 (diff) | |
| download | tor-b3918b3bbbfa9097246d63746c8b540eff2ec8e8.tar.gz tor-b3918b3bbbfa9097246d63746c8b540eff2ec8e8.zip | |
Disallow reject6 and accept6 lines in descriptors
This fixes a remotely triggerable assert on directory authorities, who
don't handle descriptors with ipv6 contents well yet. We will want to
revert this once we're ready to handle ipv6.
Issue raised by lorth on #tor, who wasn't able to use Tor anymore.
Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix
on 0.2.1.3-alpha.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/routerparse.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index aa0687d883..d76b00698f 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -222,8 +222,6 @@ typedef struct token_rule_t { static token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), - T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), - T0N("accept6", K_ACCEPT6, ARGS, NO_OBJ ), T1_START( "router", K_ROUTER, GE(5), NO_OBJ ), T1( "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY_1024 ), T1( "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY_1024 ), |