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

Remove MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS

Browse Source
This commit is contained in:
Nick Mathewson 2023-10-05 08:14:36 -04:00
parent a7993bbd72
commit a2ab949a13
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feature/dirauth/dirvote.c
View File

@ -3945,15 +3945,11 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method)
} }
if (family) { if (family) {
if (consensus_method < MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS) {
smartlist_add_asprintf(chunks, "family %s\n", family);
} else {
const uint8_t *id = (const uint8_t *)ri->cache_info.identity_digest; const uint8_t *id = (const uint8_t *)ri->cache_info.identity_digest;
char *canonical_family = nodefamily_canonicalize(family, id, 0); char *canonical_family = nodefamily_canonicalize(family, id, 0);
smartlist_add_asprintf(chunks, "family %s\n", canonical_family); smartlist_add_asprintf(chunks, "family %s\n", canonical_family);
tor_free(canonical_family); tor_free(canonical_family);
} }
}
if (summary && strcmp(summary, "reject 1-65535")) if (summary && strcmp(summary, "reject 1-65535"))
smartlist_add_asprintf(chunks, "p %s\n", summary); smartlist_add_asprintf(chunks, "p %s\n", summary);
@ -4050,8 +4046,6 @@ static const struct consensus_method_range_t {
int high; int high;
} microdesc_consensus_methods[] = { } microdesc_consensus_methods[] = {
{MIN_SUPPORTED_CONSENSUS_METHOD, {MIN_SUPPORTED_CONSENSUS_METHOD,
MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS - 1},
{MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS,
MIN_METHOD_FOR_UNPADDED_NTOR_KEY - 1}, MIN_METHOD_FOR_UNPADDED_NTOR_KEY - 1},
{MIN_METHOD_FOR_UNPADDED_NTOR_KEY, {MIN_METHOD_FOR_UNPADDED_NTOR_KEY,
MAX_SUPPORTED_CONSENSUS_METHOD}, MAX_SUPPORTED_CONSENSUS_METHOD},

6
src/feature/dirauth/dirvote.h
View File

@ -55,12 +55,6 @@
/** The highest consensus method that we currently support. */ /** The highest consensus method that we currently support. */
#define MAX_SUPPORTED_CONSENSUS_METHOD 34 #define MAX_SUPPORTED_CONSENSUS_METHOD 34
/**
* Lowest consensus method where microdescriptor lines are put in canonical
* form for improved compressibility and ease of storage. See proposal 298.
**/
#define MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS 29
/** Lowest consensus method where an unpadded base64 onion-key-ntor is allowed /** Lowest consensus method where an unpadded base64 onion-key-ntor is allowed
* See #7869 */ * See #7869 */
#define MIN_METHOD_FOR_UNPADDED_NTOR_KEY 30 #define MIN_METHOD_FOR_UNPADDED_NTOR_KEY 30