Nick Mathewson
e1deb01e5f
mingw fix: Rename a variable in the unit tests
...
Apparently, MS C is #defining "IN" on us, so we can't name a
variable IN. Delightful!
2014-02-16 12:51:35 -05:00
Nick Mathewson
3dfed0806c
Merge remote-tracking branch 'public/bug10722'
2014-02-16 12:13:12 -05:00
Nick Mathewson
b5d6e47002
Warning message when bug 10722 would trigger
...
If somebody's excludenodes settings are keeping their hidden service
connections from working, they should probably get notified about it.
2014-02-16 12:11:07 -05:00
Nick Mathewson
35423d397f
Merge branch 'bug4900_siphash_v2'
2014-02-15 15:59:10 -05:00
Nick Mathewson
1ad6dd0dbe
Remove string hash in ht.h so we can't accidentally use it
2014-02-15 15:45:38 -05:00
Nick Mathewson
b3a6907493
Remove a bunch of functions that were never called.
2014-02-15 15:33:34 -05:00
Nick Mathewson
67749475f5
Merge remote-tracking branch 'public/bug10841'
2014-02-15 15:06:06 -05:00
Nick Mathewson
9d0af78e3c
Merge remote-tracking branch 'karsten/mmdb-convert'
2014-02-15 00:08:36 -05:00
Nick Mathewson
c64b549621
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:07:15 -05:00
Nick Mathewson
bc58bfda70
Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4
2014-02-15 00:06:40 -05:00
Nick Mathewson
260b3b1a19
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-02-15 00:06:25 -05:00
Nick Mathewson
405d055465
Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3
2014-02-15 00:06:01 -05:00
Nick Mathewson
339a47e80b
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-15 00:03:29 -05:00
Sebastian Hahn
3f567f529f
gcc/clang: Mark macro-generated functions as possible unused
...
clang 3.4 introduced a new by-default warning about unused static
functions, which we triggered heavily for the hashtable and map function
generating macros. We can use __attribute__ ((unused)) (thanks nickm for
the suggestion :-) ) to silence these warnings.
2014-02-14 23:43:15 -05:00
Nick Mathewson
ac5ae794bd
tristate->enum in rendcommon functions
...
When we have more than two return values, we should really be using
an enum rather than "-2 means this, -1 means that, 0 means this, and
1 or more means a number."
2014-02-14 23:23:53 -05:00
Nick Mathewson
1987894626
fix a whitespace snafu
2014-02-14 23:00:04 -05:00
Karsten Loesing
c024ff8671
Remove another unused v0 hidserv function.
...
Noted by Nick on #10841 .
2014-02-14 17:54:16 +01:00
Karsten Loesing
f6f691df73
Update geoip6 to the February 2014 GeoIP database.
2014-02-13 19:04:51 +01:00
Karsten Loesing
436f7106b4
Exclude Teredo IPv6 prefix from geoip6.
...
The latest GeoLite2 database includes a pointer from 2001::/32 to the root
node of the IPv4 address space in the tree. We need to exclude this whole
address space from geoip6, similar to how we exclude IPv4-mapped IPv6
addresses and the 6to4 mapping subnet.
2014-02-13 18:58:21 +01:00
Roger Dingledine
745434d29a
bump to 0.2.5.2-alpha
2014-02-13 04:06:36 -05:00
Nick Mathewson
c1e98c8afe
Randomize the global siphash key at startup
...
This completes our conversion to using siphash for our hash functions.
2014-02-12 12:12:58 -05:00
Nick Mathewson
d3fb846d8c
Split crypto_global_init() into pre/post config
...
It's increasingly apparent that we want to make sure we initialize our
PRNG nice and early, or else OpenSSL will do it for us. (OpenSSL
doesn't do _too_ bad a job, but it's nice to do it ourselves.)
We'll also need this for making sure we initialize the siphash key
before we do any hashes.
2014-02-12 12:04:07 -05:00
Nick Mathewson
0e97c8e23e
Siphash-2-4 is now our hash in nearly all cases.
...
I've made an exception for cases where I'm sure that users can't
influence the inputs. This is likely to cause a slowdown somewhere,
but it's safer to siphash everything and *then* look for cases to
optimize.
This patch doesn't actually get us any _benefit_ from siphash yet,
since we don't really randomize the key at any point.
2014-02-12 11:32:10 -05:00
Nick Mathewson
f05820531a
csiphash: Add functions to take a global key.
2014-02-12 11:27:41 -05:00
Nick Mathewson
f51df9bb93
Tests for siphash, from reference implementation.
2014-02-12 10:58:03 -05:00
Nick Mathewson
1bd86b69b6
csiphash: avoid unaligned access on non-x86
2014-02-12 10:57:46 -05:00
Nick Mathewson
9605978eb6
Get csiphash better integrated with our build system
2014-02-12 10:24:04 -05:00
Nick Mathewson
f4656c0cc9
Raw import of Marek Majkowski's cisphash.c
...
siphash is a hash function designed for producing hard-to-predict
64-bit outputs from short inputs and a 128-bit key. It's chosen for
security and speed.
See https://131002.net/siphash/ for more information on siphash.
Source: https://github.com/majek/csiphash/
2014-02-12 10:09:45 -05:00
Nick Mathewson
2c0088b8aa
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-12 09:17:11 -05:00
Nick Mathewson
d6e6eaba60
Fix windows compilation of e0c8031516
...
There is no WSAEPERM; we were implying that there was.This fixes a
bug in e0c8031516
, which hadn't yet
appeared in any released Tor.
2014-02-12 09:16:22 -05:00
Karsten Loesing
74c2bff781
Remove remaining v0 hidden service descriptor code.
...
Fixes the rest of #10841 after #10881 already removed some hidden service
authority code.
2014-02-12 14:36:08 +01:00
Nick Mathewson
0ee449ca92
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-11 18:58:58 -05:00
Nick Mathewson
91d4bb0b00
Merge branch 'bug10777_netunreach_024' into maint-0.2.4
2014-02-11 18:57:55 -05:00
Nick Mathewson
8836c1ee2f
Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
2014-02-11 18:55:26 -05:00
Nick Mathewson
c3720c05fa
Free leakable values in the unit tests.
...
Thanks, Coverity! (CID 1171414, 1171415, 1171416)
2014-02-11 18:10:33 -05:00
Nick Mathewson
10d4d3e2d5
Merge remote-tracking branch 'public/no_itime_queue_025'
2014-02-11 11:52:35 -05:00
Nick Mathewson
5e0cdc5ef2
Merge branch 'bug10881'
2014-02-11 11:42:06 -05:00
Nick Mathewson
cb065a55bd
Merge remote-tracking branch 'karsten/one-dirauth'
2014-02-11 10:15:03 -05:00
Nick Mathewson
cb28fe486f
Merge remote-tracking branch 'public/bug10722'
2014-02-11 10:08:58 -05:00
Nick Mathewson
c0483c7f85
Remove options for configuring HS authorities.
...
(There is no longer meaningfully any such thing as a HS authority,
since we stopped uploading or downloading v0 hs descriptors in
0.2.2.1-alpha.)
Implements #10881 , and part of #10841 .
2014-02-10 22:41:52 -05:00
Roger Dingledine
dd3f2f6332
fix trivial typo
2014-02-10 16:05:35 -05:00
Nick Mathewson
e0c8031516
make EACCES survivable too.
2014-02-10 15:06:10 -05:00
Nick Mathewson
5b55e0e181
Merge remote-tracking branch 'public/no_itime_queue'
...
The conflicts here were tricky, and required me to eliminate the
command-queue as well. That wasn't so hard.
Conflicts:
src/or/or.h
src/or/relay.c
2014-02-10 15:04:23 -05:00
Nick Mathewson
3133cde3c1
Excise the insertion_time_elem_t logic
...
It's now redundant with the inserted_time field in packed_cell_t
Fixes bug 10870.
2014-02-10 13:55:27 -05:00
Nick Mathewson
a73b0da653
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-09 21:41:59 -05:00
Nick Mathewson
7f6aa780e3
Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4
2014-02-09 21:41:24 -05:00
Nick Mathewson
b15f75b632
Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
...
It can happen because we sent something that got an ENETUNREACH
response.
Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777.
2014-02-09 21:35:14 -05:00
Nick Mathewson
f5d32c08ba
Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
...
Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc.
2014-02-09 21:30:23 -05:00
Andrea Shepard
c330d63ff7
Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too
2014-02-08 14:05:51 -08:00
Karsten Loesing
26dd328891
Update to the February 2014 GeoIP database.
2014-02-08 12:09:37 +01:00