nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/531'

Browse Source
This commit is contained in:
David Goulet 2022-02-16 13:59:37 -05:00
commit d057f45c6c
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/ticket40559 Normal file
View File

@ -0,0 +1,2 @@
o Minor feature (authority, relay):
- Reject End-Of-Life relays running version 0.3.5.x. Closes ticket 40559.

17
src/feature/dirauth/process_descs.c
View File

@ -404,21 +404,8 @@ dirserv_rejects_tor_version(const char *platform,
static const char please_upgrade_string[] =
"Tor version is insecure or unsupported. Please upgrade!";
/* Versions before Tor 0.3.5 are unsupported.
*
* Also, reject unstable versions of 0.3.5, since (as of this writing)
* they are almost none of the network. */
if (!tor_version_as_new_as(platform,"0.3.5.7")) {
if (msg)
*msg = please_upgrade_string;
return true;
}
/* Series between Tor 0.3.6.x and 0.4.5.5-rc inclusive are unsupported.
* Reject them. 0.3.6.0-alpha-dev only existed for a short time, before it
* was renamed to 0.4.0.0-alpha-dev. */
if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") &&
!tor_version_as_new_as(platform,"0.4.5.6")) {
/* 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;
}

7
src/test/test_process_descs.c
View File

@ -21,9 +21,9 @@ test_process_descs_versions(void *arg)
// a non-tor program: don't reject.
{ "Wombat 0.1.2.3-alpha", false },
// some unsupported versions: reject.
{ "Tor 0.2.9.100", true },
{ "Tor 0.2.9.4-alpha", true },
{ "Tor 0.2.9.5-alpha", true },
{ "Tor 0.2.9.100", true },
{ "Tor 0.3.0.0-alpha-dev", true },
{ "Tor 0.3.0.2-alpha", true },
{ "Tor 0.3.0.5", true },
@ -34,6 +34,8 @@ test_process_descs_versions(void *arg)
{ "Tor 0.3.4.100", true },
{ "Tor 0.3.5.1-alpha", true },
{ "Tor 0.3.5.6-rc", true},
{ "Tor 0.3.5.7", true },
{ "Tor 0.3.5.8", true },
{ "Tor 0.4.0.1-alpha", true },
{ "Tor 0.4.0.5", true },
{ "Tor 0.4.1.1-alpha", true },
@ -47,12 +49,11 @@ test_process_descs_versions(void *arg)
{ "Tor 0.4.4.9", true },
{ "Tor 0.4.5.5-rc", true },
// new enough to be supported
{ "Tor 0.3.5.7", false },
{ "Tor 0.3.5.8", false },
{ "Tor 0.4.5.6", false },
{ "Tor 0.4.6.0-alpha-dev", false },
{ "Tor 0.4.6.5", false },
{ "Tor 0.4.7.0-alpha-dev", false },
{ "Tor 0.4.7.3-alpha", false },
// Very far in the future
{ "Tor 100.100.1.5", false },
};