[or-cvs] r10814: Backport r10790: omit reasons from destroy cells from the ci (in tor/branches/tor-0_1_2-patches: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:50:41 -0400 (Thu, 12 Jul 2007)
New Revision: 10814

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/doc/TODO.012
   tor/branches/tor-0_1_2-patches/src/or/circuitlist.c
Log:
 r13734 at catbus:  nickm | 2007-07-12 12:50:39 -0400
 Backport r10790: omit reasons from destroy cells from the circuit origin.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13734] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:35:10 UTC (rev 10813)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2007-07-12 16:50:41 UTC (rev 10814)
@@ -15,6 +15,11 @@
     - Fix a possible buffer overrun when using BSD natd support.  Bug found
       by "Mr. Croup."
 
+  o Minor bugfixes (security):
+    - When sending destroy cells from a circuit's origin, don't include
+      the reason for tearing down the circuit. The spec says we didn't,
+      and now we actually don't. Reported by lodger.
+
   o Minor bugfixes (directory)
     - Count the number of authorities that recommend each version
       correctly.  Previously, we were under-counting by 1.

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:35:10 UTC (rev 10813)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:50:41 UTC (rev 10814)
@@ -16,7 +16,7 @@
   o r10643: eventdns.c behavior fix for solaris.
   - r10730: Don't choose guards after any never-connected-to guard. (??)
   o r10760: fix possible buffer overrun in old BSD natd code
-  - r10790: Don't include reasons in destroy cells from the origin.
+  o r10790: Don't include reasons in destroy cells from the origin.
   - Some fix for bug 455.
 
 

Modified: tor/branches/tor-0_1_2-patches/src/or/circuitlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/circuitlist.c	2007-07-12 16:35:10 UTC (rev 10813)
+++ tor/branches/tor-0_1_2-patches/src/or/circuitlist.c	2007-07-12 16:50:41 UTC (rev 10814)
@@ -884,9 +884,9 @@
                file, line, circ->purpose);
     }
     reason = END_CIRC_REASON_NONE;
-  } else if (CIRCUIT_IS_ORIGIN(circ) && reason < _END_CIRC_REASON_MIN) {
-    /* We don't send reasons when closing circuits at the origin, but we want
-     * to track them anyway so we can give them to the controller. */
+  }
+  if (CIRCUIT_IS_ORIGIN(circ)) {
+    /* We don't send reasons when closing circuits at the origin. */
     reason = END_CIRC_REASON_NONE;
   }