[tor-commits] [tor] 01/04: Update 3 files

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

commit 8f50f490a67fdbd13cb2ab8bec561d831c943676
Author: nonameformee <545-nonameformee at gitlab.torproject.org>
AuthorDate: Sun Mar 12 11:40:52 2023 +0000

    Update 3 files
    
    - /src/feature/dirauth/process_descs.c
    - /src/test/test_process_descs.c
    - /changes/ticket40760
---
 changes/ticket40760                 |  3 +++
 src/feature/dirauth/process_descs.c | 13 ++-----------
 src/test/test_process_descs.c       |  8 +++-----
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/changes/ticket40760 b/changes/ticket40760
new file mode 100644
index 0000000000..b5e3df7904
--- /dev/null
+++ b/changes/ticket40760
@@ -0,0 +1,3 @@
+  o Minor feature (authority):
+    - Reject 0.4.5.x series at the authority level. Closes ticket 40760.
+
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
index 3cdace452f..7fd930e246 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -404,17 +404,8 @@ dirserv_rejects_tor_version(const char *platform,
   static const char please_upgrade_string[] =
     "Tor version is insecure or unsupported. Please upgrade!";
 
-  /* Anything before 0.4.5.6 is unsupported. Reject them. */
-  if (!tor_version_as_new_as(platform,"0.4.5.6")) {
-    if (msg) {
-      *msg = please_upgrade_string;
-    }
-    return true;
-  }
-
-  /* Reject 0.4.6.x series. */
-  if (tor_version_as_new_as(platform, "0.4.6.0") &&
-      !tor_version_as_new_as(platform, "0.4.7.0-alpha-dev")) {
+  /* Anything before 0.4.7.0 is unsupported. Reject them. */
+  if (!tor_version_as_new_as(platform,"0.4.7.0-alpha-dev")) {
     if (msg) {
       *msg = please_upgrade_string;
     }
diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c
index abcb6ae2fe..c13e8b58c4 100644
--- a/src/test/test_process_descs.c
+++ b/src/test/test_process_descs.c
@@ -47,17 +47,15 @@ test_process_descs_versions(void *arg)
     { "Tor 0.4.3.0-alpha-dev", true },
     { "Tor 0.4.3.8", true },
     { "Tor 0.4.4.9", true },
-
-    /* The 0.4.5.x series stable is supported. */
     { "Tor 0.4.5.5-rc", true },
-    { "Tor 0.4.5.6", false },
-    { "Tor 0.4.5.15", false },
-
+    { "Tor 0.4.5.6", true },
+    { "Tor 0.4.5.15", true },
     { "Tor 0.4.6.0-alpha-dev", true },
     { "Tor 0.4.6.1-alpha", true },
     { "Tor 0.4.6.5", true },
     { "Tor 0.4.6.50", true }, /* Non existing one in the 0.4.6 series */
 
+    /* The 0.4.7.x series is supported. */
     { "Tor 0.4.7.0-alpha-dev", false },
     { "Tor 0.4.7.3-alpha", false },
     { "Tor 0.4.7.12", false },

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.