mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug20270_029'

Browse source
This commit is contained in:
Nick Mathewson 2017-05-15 10:45:20 -04:00
commit d3a39cf8d0
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changes/bug20270 Normal file
View file

@ -0,0 +1,6 @@
o Minor bugfixes (directory authority):
- When rejecting a router descriptor because the relay is running an
obsolete version of Tor without ntor support, warn about the obsolete
tor version, not the missing ntor key. Fixes bug 20270;
bugfix on 0.2.9.3-alpha.

11
src/or/dirserv.c
View file

@ -284,6 +284,13 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg,
return FP_REJECT;
}
/* Check for the more usual versions to reject a router first. */
const uint32_t r = dirserv_get_status_impl(d, router->nickname,
router->addr, router->or_port,
router->platform, msg, severity);
if (r)
return r;
/* dirserv_get_status_impl already rejects versions older than 0.2.4.18-rc,
* and onion_curve25519_pkey was introduced in 0.2.4.8-alpha.
* But just in case a relay doesn't provide or lies about its version, or
@ -334,9 +341,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg,
}
}
return dirserv_get_status_impl(d, router->nickname,
router->addr, router->or_port,
router->platform, msg, severity);
return 0;
}
/** Return true if there is no point in downloading the router described by