[tor-commits] [tor/release-0.4.5] Remove DirCache=1 from list of supported versions.

[asn at torproject.org]

commit 8d80126eee396b503e464f2647b7ca00fd9db6c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 11:40:35 2021 -0500

    Remove DirCache=1 from list of supported versions.
    
    Closes #40221
---
 changes/ticket40221_045       | 6 ++++++
 src/core/or/protover.c        | 2 +-
 src/rust/protover/protover.rs | 4 ++--
 src/test/test_protover.c      | 3 ---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/changes/ticket40221_045 b/changes/ticket40221_045
new file mode 100644
index 0000000000..0f3ab894c2
--- /dev/null
+++ b/changes/ticket40221_045
@@ -0,0 +1,6 @@
+  o Minor features (protocol versions):
+    - Stop claiming to support the "DirCache=1" subprotocol version.
+      Technically, we stopped supporting this subprotocol back in
+      0.4.5.1-alpha, but we needed to wait for the authorities to stop
+      listing it as "required" before we can drop support. Closes ticket
+      40221.
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index 5a87ade3da..aa96cafff9 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -398,7 +398,7 @@ protover_get_supported_protocols(void)
   return
     "Cons=1-2 "
     "Desc=1-2 "
-    "DirCache=1-2 "
+    "DirCache=2 "
     "FlowCtrl=1 "
     "HSDir=1-2 "
     "HSIntro=3-5 "
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
index 0060864a2e..da87509ffa 100644
--- a/src/rust/protover/protover.rs
+++ b/src/rust/protover/protover.rs
@@ -160,7 +160,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
              HSIntro=3-5 \
@@ -175,7 +175,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
              HSIntro=3-5 \
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
index be3aeb5e40..dd65f4bbf5 100644
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@ -467,9 +467,6 @@ test_protover_supported_protocols(void *arg)
                                             PROTOVER_HSDIR_V3));
 
   /* No DirCache versions appear anywhere in the code. */
-  tt_assert(protocol_list_supports_protocol(supported_protocols,
-                                            PRT_DIRCACHE,
-                                            PROTOVER_DIRCACHE_V1));
   tt_assert(protocol_list_supports_protocol(supported_protocols,
                                             PRT_DIRCACHE,
                                             PROTOVER_DIRCACHE_V2));