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

Merge branch 'trove-2017-012_030' into maint-0.3.0

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-30 12:07:43 -05:00
commit d459c08b7d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/trove-2017-012-part2 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (security, relay):
- When running as a relay, make sure that we never ever choose ourselves
as a guard. Previously, this was possible. Fixes part of bug 21534;
bugfix on 0.3.0.1-alpha. This issue is also tracked as TROVE-2017-012
and CVE-2017-8822.

3
src/or/entrynodes.c
View File

@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node)
node->is_stable && node->is_stable &&
node->is_fast && node->is_fast &&
node->is_valid && node->is_valid &&
node_is_dir(node)); node_is_dir(node) &&
!router_digest_is_me(node->identity));
} }
/** /**