svn commit: r321080 - in head/security/tor-devel: . files

[Brendan Fabeny]

Author: bf
Date: Sun Jun 16 22:42:53 2013
New Revision: 321080
URL: http://svnweb.freebsd.org/changeset/ports/321080

Log:
  Disable the faulty fix for Tor bug 9063, which could compromise anonymity
  
  Security:	Tor bug 9072

Added:
  head/security/tor-devel/files/patch-src__or__relay.c   (contents, props changed)
Modified:
  head/security/tor-devel/Makefile

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Sun Jun 16 22:03:47 2013	(r321079)
+++ head/security/tor-devel/Makefile	Sun Jun 16 22:42:53 2013	(r321080)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tor
 DISTVERSION=	0.2.4.13-alpha
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	https://www.torproject.org/dist/ \
 		ftp://ftp.bit.nl/mirror/tor/ \

Added: head/security/tor-devel/files/patch-src__or__relay.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/tor-devel/files/patch-src__or__relay.c	Sun Jun 16 22:42:53 2013	(r321080)
@@ -0,0 +1,21 @@
+--- src/or/relay.c.orig	2013-06-14 04:07:30.000000000 -0400
++++ src/or/relay.c	2013-06-15 05:20:19.000000000 -0400
+@@ -2482,6 +2482,10 @@
+     streams_blocked = circ->streams_blocked_on_p_chan;
+   }
+ 
++  /*
++   * Disabling this for now because of a possible guard discovery attack
++   */
++#if 0
+   /* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */
+   if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) {
+     orcirc = TO_OR_CIRCUIT(circ);
+@@ -2505,6 +2509,7 @@
+       }
+     }
+   }
++#endif
+ 
+   cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);
+