summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-07 11:15:23 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-07 11:15:23 -0400
commit26cee9691134098bbffb257ac123b5705f9fc0a1 (patch)
tree65552fb3296098a51ad11966b0b4a29837e3306a
parent3fe2161d28f27e2f036991eb4d4b035a064d36b5 (diff)
downloadtor-26cee9691134098bbffb257ac123b5705f9fc0a1.tar.gz
tor-26cee9691134098bbffb257ac123b5705f9fc0a1.zip
Dirservers no longer accept tors released before December 2011.
Implements ticket 6789.
-rw-r--r--changes/bug67897
-rw-r--r--src/or/dirserv.c14
2 files changed, 14 insertions, 7 deletions
diff --git a/changes/bug6789 b/changes/bug6789
new file mode 100644
index 0000000000..c901e55215
--- /dev/null
+++ b/changes/bug6789
@@ -0,0 +1,7 @@
+ o Minor features (directory authority):
+ - Directory authorities no long accept descriptors for any version of
+ Tor before 0.2.2.35, or for any 0.2.3 release before 0.2.3.10-alpha.
+ These versions are insecure, unsupported, or both. Implements ticket
+ #6789.
+
+
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7f4690678e..10bd82b73e 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -398,18 +398,18 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname,
strmap_size(fingerprint_list->fp_by_name),
digestmap_size(fingerprint_list->status_by_digest));
- /* Versions before Tor 0.2.1.30 have known security issues that
+ /* Versions before Tor 0.2.2.35 have known security issues that
* make them unsuitable for the current network. */
- if (platform && !tor_version_as_new_as(platform,"0.2.1.30")) {
+ if (platform && !tor_version_as_new_as(platform,"0.2.2.35")) {
if (msg)
- *msg = "Tor version is insecure. Please upgrade!";
+ *msg = "Tor version is insecure or unsupported. Please upgrade!";
return FP_REJECT;
- } else if (platform && tor_version_as_new_as(platform,"0.2.2.1-alpha")) {
- /* Versions from 0.2.2.1-alpha...0.2.2.20-alpha have known security
+ } else if (platform && tor_version_as_new_as(platform,"0.2.3.0-alpha")) {
+ /* Versions from 0.2.3-alpha...0.2.3.9-alpha have known security
* issues that make them unusable for the current network */
- if (!tor_version_as_new_as(platform, "0.2.2.21-alpha")) {
+ if (!tor_version_as_new_as(platform, "0.2.3.10-alpha")) {
if (msg)
- *msg = "Tor version is insecure. Please upgrade!";
+ *msg = "Tor version is insecure or unsupported. Please upgrade!";
return FP_REJECT;
}
}