cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to next major release 0.2.6.6.

Browse Source 
Changes in version 0.2.6.6 - 2015-03-24
  Tor 0.2.6.6 is the first stable release in the 0.2.6 series.

  It adds numerous safety, security, correctness, and performance
  improvements. Client programs can be configured to use more kinds of
  sockets, AutomapHosts works better, the multithreading backend is
  improved, cell transmission is refactored, test coverage is much
  higher, more denial-of-service attacks are handled, guard selection is
  improved to handle long-term guards better, pluggable transports
  should work a bit better, and some annoying hidden service performance
  bugs should be addressed.
This commit is contained in:
pascal 2015-03-26 21:32:30 +00:00
parent e3a281c0c2
commit 46628e5b83
4 changed files with 8 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/tor/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.77 2015/03/23 16:21:10 pascal Exp $
# $OpenBSD: Makefile,v 1.78 2015/03/26 21:32:30 pascal Exp $
COMMENT= anonymity service using onion routing
DISTNAME= tor-0.2.5.11
REVISION= 0
DISTNAME= tor-0.2.6.6
CATEGORIES= net
HOMEPAGE= https://www.torproject.org/

4
net/tor/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tor-0.2.5.11.tar.gz) = ruD67pw/G7Jl7o6UtLuTlnQT88VuZflU2xawlFFUZ2k=
SIZE (tor-0.2.5.11.tar.gz) = 3310350
SHA256 (tor-0.2.6.6.tar.gz) = wzSeRXxxuOXBOMZWknsrvKC/oDU5/+6FebDlaP+xAoM=
SIZE (tor-0.2.6.6.tar.gz) = 3594452

8
net/tor/patches/patch-src_config_torrc_sample_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_config_torrc_sample_in,v 1.13 2014/10/24 20:14:48 pascal Exp $
--- src/config/torrc.sample.in.orig Fri Oct 10 15:06:24 2014
+++ src/config/torrc.sample.in Fri Oct 24 16:54:52 2014
$OpenBSD: patch-src_config_torrc_sample_in,v 1.14 2015/03/26 21:32:30 pascal Exp $
--- src/config/torrc.sample.in.orig Tue Feb 24 16:33:30 2015
+++ src/config/torrc.sample.in Wed Mar 25 11:33:26 2015
@@ -38,18 +38,18 @@
## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
#Log debug file @LOCALSTATEDIR@/log/tor/debug.log
@ -23,7 +23,7 @@ $OpenBSD: patch-src_config_torrc_sample_in,v 1.13 2014/10/24 20:14:48 pascal Exp
## The port on which Tor will listen for local connections from Tor
## controller applications, as documented in control-spec.txt.
@@ -172,6 +172,8 @@
@@ -173,6 +173,8 @@
## For security, by default Tor rejects connections to private (local)
## networks, including to your public IP address. See the man page entry
## for ExitPolicyRejectPrivate if you want to allow "exit enclaving".

53
net/tor/patches/patch-src_ext_csiphash_c
View File

@ -1,53 +0,0 @@
$OpenBSD: patch-src_ext_csiphash_c,v 1.1 2015/03/23 16:21:10 pascal Exp $
commit 732f522a42702494c4029da568a2603bb963e402
Author: Yawning Angel <yawning@schwanenlied.me>
Date: Sun Mar 22 22:31:08 2015 +0000
Fix unaligned access in SipHash-2-4.
The compiler is allowed to assume that a "uint64_t *" is aligned
correctly, and will inline a version of memcpy that acts as such.
Use "uint8_t *", so the compiler does the right thing.
--- src/ext/csiphash.c.orig Thu Mar 12 17:49:50 2015
+++ src/ext/csiphash.c Mon Mar 23 17:15:02 2015
@@ -100,10 +100,18 @@ uint64_t siphash24(const void *src, unsigned long src_
uint64_t k0 = key->k0;
uint64_t k1 = key->k1;
uint64_t b = (uint64_t)src_sz << 56;
+#ifdef UNALIGNED_OK
const uint64_t *in = (uint64_t*)src;
+#else
+ /* On platforms where alignment matters, if 'in' is a pointer to a
+ * datatype that must be aligned, the compiler is allowed to
+ * generate code that assumes that it is aligned as such.
+ */
+ const uint8_t *in = (uint8_t *)src;
+#endif
- uint64_t t;
- uint8_t *pt, *m;
+ uint64_t t;
+ uint8_t *pt, *m;
uint64_t v0 = k0 ^ 0x736f6d6570736575ULL;
uint64_t v1 = k1 ^ 0x646f72616e646f6dULL;
@@ -113,12 +121,14 @@ uint64_t siphash24(const void *src, unsigned long src_
while (src_sz >= 8) {
#ifdef UNALIGNED_OK
uint64_t mi = _le64toh(*in);
+ in += 1;
#else
uint64_t mi;
memcpy(&mi, in, 8);
mi = _le64toh(mi);
+ in += 8;
#endif
- in += 1; src_sz -= 8;
+ src_sz -= 8;
v3 ^= mi;
DOUBLE_ROUND(v0,v1,v2,v3);
v0 ^= mi;