Update 3 files

- /src/feature/dirauth/process_descs.c
- /src/test/test_process_descs.c
- /changes/ticket40760
This commit is contained in:
nonameformee 2023-03-12 11:40:52 +00:00
parent 3fa08dc9a7
commit 8f50f490a6
3 changed files with 8 additions and 16 deletions

3
changes/ticket40760 Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (authority):
- Reject 0.4.5.x series at the authority level. Closes ticket 40760.

View File

@ -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;
}

View File

@ -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 },