diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-09 14:54:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-22 20:00:47 -0400 |
| commit | caf766991dfd82dd1599ce90adc8afb9e749f468 (patch) | |
| tree | 756a2d00d82f69d2e4c259499824e84e263f8955 /src/or | |
| parent | 93380db8333609b8613a1e987894c6f1fd8be6aa (diff) | |
| download | tor-caf766991dfd82dd1599ce90adc8afb9e749f468.tar.gz tor-caf766991dfd82dd1599ce90adc8afb9e749f468.zip | |
Remove MIN_METHOD_FOR_ID_HASH_IN_MD and a test for running without it.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirvote.c | 2 | ||||
| -rw-r--r-- | src/or/dirvote.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 334ebfb7f7..1a21def463 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3862,7 +3862,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) tor_free(p6); } - if (consensus_method >= MIN_METHOD_FOR_ID_HASH_IN_MD) { + { char idbuf[ED25519_BASE64_LEN+1]; const char *keytype; if (consensus_method >= MIN_METHOD_FOR_ED25519_ID_IN_MD && diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 311bc61e16..334dc07321 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -61,10 +61,6 @@ /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 28 -/** Lowest consensus method where authorities may include an "id" line in - * microdescriptors. */ -#define MIN_METHOD_FOR_ID_HASH_IN_MD 18 - /** Lowest consensus method where we include "package" lines*/ #define MIN_METHOD_FOR_PACKAGE_LINES 19 |