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

Authorities reject descriptors without ntor keys

Browse Source 
Before, they checked for version 0.2.4.18-rc or later, but this
would not catch relays without version lines, or buggy or malicious
relays missing an ntor key.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-07-06 16:50:48 +10:00
parent 9932544297
commit 33da2abd05
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/reject-tap Normal file
View File

@ -0,0 +1,4 @@
o Major bug fixes (circuit building):
- Authorites should not trust the version a relay claims (if any),
instead, they should check specifically for an ntor key.
Fixes bug 19163; bugfix on 0.2.4.18-rc.

16
src/or/dirserv.c
View File

@ -255,6 +255,22 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg,
return FP_REJECT;
}
/* 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
* doesn't include an ntor key in its descriptor, check that it exists,
* and is non-zero (clients check that it's non-zero before using it). */
if (router->onion_curve25519_pkey == NULL ||
tor_mem_is_zero((const char*)router->onion_curve25519_pkey->public_key,
CURVE25519_PUBKEY_LEN)) {
log_fn(severity, LD_DIR,
"Descriptor from router %s is missing an ntor curve25519 onion "
"key.", router_describe(router));
if (msg)
*msg = "Missing ntor curve25519 onion key. Please upgrade!";
return FP_REJECT;
}
if (router->cache_info.signing_key_cert) {
/* This has an ed25519 identity key. */
if (KEYPIN_MISMATCH ==