diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-22 10:07:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-22 10:07:42 -0500 |
| commit | 60efce445b17d4b4153e91527887873812f5599f (patch) | |
| tree | 30129c34577653cac2a03d44712440c103b1a83d /src/or/dirvote.c | |
| parent | be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea (diff) | |
| download | tor-60efce445b17d4b4153e91527887873812f5599f.tar.gz tor-60efce445b17d4b4153e91527887873812f5599f.zip | |
Enable ed25519 collator in voting.
Previously, I had left in some debugging code with /*XXX*/ after it,
which nobody noticed. Live and learn! Next time I will use /*XXX
DO NOT COMMIT*/ or something.
We need to define a new consensus method for this; consensus method
21 shouldn't actually be used.
Fixes bug 17702; bugfix on 0.2.7.2-alpha.
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index d8e6ee2229..be0635d92b 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -558,6 +558,13 @@ compute_consensus_method(smartlist_t *votes) static int consensus_method_is_supported(int method) { + if (method == MIN_METHOD_FOR_ED25519_ID_IN_MD) { + /* This method was broken due to buggy code accidently left in + * dircollate.c; do not actually use it. + */ + return 0; + } + return (method >= MIN_SUPPORTED_CONSENSUS_METHOD) && (method <= MAX_SUPPORTED_CONSENSUS_METHOD); } |