get rid of 0.0.8 backwards compatibility

svn:r3353

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 89d4a584779fb4ae345b18c889808ef6a1320624..35a83fd4598a67c069e10f9211f69c1e432bac10 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -85,9 +85,6 @@ static int circuit_is_acceptable(circuit_t *circ,
 
     if (conn->socks_request &&
         conn->socks_request->command == SOCKS_COMMAND_RESOLVE) {
-      /* 0.0.8 servers have buggy resolve support. */
-      if (!tor_version_as_new_as(exitrouter->platform, "0.0.9pre1"))
-        return 0;
     } else if (purpose == CIRCUIT_PURPOSE_C_GENERAL) {
       if (!connection_ap_can_use_exit(conn, exitrouter)) {
         /* can't exit from this router */

diff --git a/src/or/config.c b/src/or/config.c
index 84d820009707d48f521bac1cc9fcfbd46f5bef8b..63e586c3e363854a4068ad69c6a00911f09d1c79 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1332,8 +1332,7 @@ options_validate(or_options_t *options)
 #define MIN_REND_POST_PERIOD 300
 #define MIN_STATUS_FETCH_PERIOD 60
 
-  /* After 0.0.8 is dead, change this to MIN_ONION_KEY_LIFETIME. */
-#define MAX_DIR_PERIOD (OLD_MIN_ONION_KEY_LIFETIME/2)
+#define MAX_DIR_PERIOD (MIN_ONION_KEY_LIFETIME/2)
 #define MAX_CACHE_DIR_FETCH_PERIOD 3600
 #define MAX_CACHE_STATUS_FETCH_PERIOD 900
 

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5cbb312d21ea99b86c176dc33ff2e08d65ee7728..65aaefb8bc6516a0d16949f5ee3d805f6c088aff 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1016,11 +1016,7 @@ int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit)
     }
   }
 
-  if (conn->socks_request->command == SOCKS_COMMAND_RESOLVE) {
-    /* 0.0.8 servers have buggy resolve support. */
-    if (!tor_version_as_new_as(exit->platform, "0.0.9pre1"))
-      return 0;
-  } else {
+  if (conn->socks_request->command != SOCKS_COMMAND_RESOLVE) {
     addr = client_dns_lookup_entry(conn->socks_request->address);
     if (router_compare_addr_to_addr_policy(addr, conn->socks_request->port,
           exit->exit_policy) == ADDR_POLICY_REJECTED)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index f1ec0fcf95b49b609e28d11861073db3d564caff..35b19c5d777ec7fa56bac1349859e6daa8ab4ded 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -344,16 +344,10 @@ connection_tls_finish_handshake(connection_t *conn) {
   conn->state = OR_CONN_STATE_OPEN;
   connection_watch_events(conn, EV_READ);
   log_fn(LOG_DEBUG,"tls handshake done. verifying.");
-  if (! tor_tls_peer_has_cert(conn->tls)) { /* It's an old OP. */
-    if (server_mode(options)) { /* I'm an OR; good. */
-      conn->receiver_bucket = conn->bandwidth = DEFAULT_BANDWIDTH_OP;
-      return 0;
-    } else { /* Neither side sent a certificate: ouch. */
-      log_fn(LOG_WARN,"Neither peer sent a cert! Closing.");
-      return -1;
-    }
+  if (! tor_tls_peer_has_cert(conn->tls)) {
+    log_fn(LOG_WARN,"Peer didn't send a cert! Closing.");
+    return -1;
   }
-  /* Okay; the other side is an OR or a post-0.0.8 OP (with a cert). */
   if (tor_tls_get_peer_cert_nickname(conn->tls, nickname, sizeof(nickname))) {
     log_fn(LOG_WARN,"Other side (%s:%d) has a cert without a valid nickname. Closing.",
            conn->address, conn->port);

diff --git a/src/or/or.h b/src/or/or.h
index 319e4f2968185c9b9b65f92989045ec7e327b06f..2479df984492659d242cd2b3f7289c8f70034160 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -145,7 +145,6 @@
 #endif
 
 /** How often do we rotate onion keys? */
-#define OLD_MIN_ONION_KEY_LIFETIME (12*60*60) /* twice a day */
 #define MIN_ONION_KEY_LIFETIME (7*24*60*60) /* once a week */
 /** How often do we rotate TLS contexts? */
 #define MAX_SSL_KEY_LIFETIME (120*60)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index b78828bc4d7d7c9ce5c99d23e0bb4e5593d95ca1..c4411fdcdce277d34c2052e12d55c44764c0aa39 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -64,9 +64,8 @@ int router_reload_router_list(void)
       log_fn(LOG_WARN, "Cached directory at '%s' was unparseable; ignoring.", filename);
     }
     if (routerlist &&
-        ((routerlist->published_on > time(NULL) - OLD_MIN_ONION_KEY_LIFETIME/2)
+        ((routerlist->published_on > time(NULL) - MIN_ONION_KEY_LIFETIME/2)
          || is_recent)) {
-      /* XXX use new onion key lifetime when 0.0.8 servers are obsolete */
       directory_has_arrived(st.st_mtime); /* do things we've been waiting to do */
     }
     tor_free(s);