tor

commit d3bcbccab9d50fd0dafc682f7ee63902ea344be7
parent ceddc39c597c7d794cc4b875820e872fbaad5a4b
Author: David Goulet <dgoulet@torproject.org>
Date:   Tue, 23 Jun 2020 08:52:33 -0400

Merge branch 'maint-0.4.4'

Diffstat:
A
changes/ticket32696
 | 
7
+++++++
M
src/feature/dirauth/dirvote.c
 | 
4
++--
M
src/feature/dirauth/dirvote.h
 | 
12
++++++------
M
src/test/test_protover.c
 | 
4
++--

4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/changes/ticket32696 b/changes/ticket32696
@@ -0,0 +1,7 @@
+  o Minor features (directory authority):
+    - Authorities now recommend protocol versions that are supported
+      by Tor 0.3.5 and later. (Earlier versions of Tor have been
+      deprecated since January of this year.)  This recommendation
+      will cause older clients and relays to give a warning on startup,
+      or when they download a consensus directory.
+      Closes ticket 32696.
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
@@ -4679,9 +4679,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
 
   /* These are hardwired, to avoid disaster. */
   v3_out->recommended_relay_protocols =
-    tor_strdup(DIRVOTE_RECCOMEND_RELAY_PROTO);
+    tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO);
   v3_out->recommended_client_protocols =
-    tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO);
+    tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO);
 
   v3_out->required_relay_protocols =
     tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO);
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
@@ -238,15 +238,15 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
 /** The recommended relay protocols for this authority's votes.
  * Recommending a new protocol causes old tor versions to log a warning.
  */
-#define DIRVOTE_RECCOMEND_RELAY_PROTO \
-  "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
-  "Link=4 Microdesc=1-2 Relay=2"
+#define DIRVOTE_RECOMMEND_RELAY_PROTO \
+  "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \
+  "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2"
 /** The recommended client protocols for this authority's votes.
  * Recommending a new protocol causes old tor versions to log a warning.
  */
-#define DIRVOTE_RECCOMEND_CLIENT_PROTO \
-  "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \
-  "Link=4 Microdesc=1-2 Relay=2"
+#define DIRVOTE_RECOMMEND_CLIENT_PROTO \
+  "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \
+  "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2"
 
 /** The required relay protocols for this authority's votes.
  * WARNING: Requiring a new protocol causes old tor versions to shut down.
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
@@ -680,8 +680,8 @@ test_protover_vote_roundtrip_ours(void *args)
   (void) args;
   const char *examples[] = {
     protover_get_supported_protocols(),
-    DIRVOTE_RECCOMEND_RELAY_PROTO,
-    DIRVOTE_RECCOMEND_CLIENT_PROTO,
+    DIRVOTE_RECOMMEND_RELAY_PROTO,
+    DIRVOTE_RECOMMEND_CLIENT_PROTO,
     DIRVOTE_REQUIRE_RELAY_PROTO,
     DIRVOTE_REQUIRE_CLIENT_PROTO,
   };