diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-30 12:07:43 -0500 |
| commit | d459c08b7d5cb1766bda5443ea2750bca160212d (patch) | |
| tree | 0a1e1ea342dc786ca140a04ce8f085b42c4d014f | |
| parent | 766d0a2d98591ed840cce42710c5a59a2e7dc731 (diff) | |
| parent | 91cee3c9e73aba089804cd88305115fc3ab1f76c (diff) | |
| download | tor-d459c08b7d5cb1766bda5443ea2750bca160212d.tar.gz tor-d459c08b7d5cb1766bda5443ea2750bca160212d.zip | |
Merge branch 'trove-2017-012_030' into maint-0.3.0
| -rw-r--r-- | changes/trove-2017-012-part2 | 5 | ||||
| -rw-r--r-- | src/or/entrynodes.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/trove-2017-012-part2 b/changes/trove-2017-012-part2 new file mode 100644 index 0000000000..ed994c5b02 --- /dev/null +++ b/changes/trove-2017-012-part2 @@ -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. diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d762afdcfe..0109da8e01 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -740,7 +740,8 @@ node_is_possible_guard(const node_t *node) node->is_stable && node->is_fast && node->is_valid && - node_is_dir(node)); + node_is_dir(node) && + !router_digest_is_me(node->identity)); } /** |