Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
443dddb749
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-03-09 10:36:35 -05:00
Nick Mathewson
21f9829e79
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-03-09 10:36:20 -05:00
Karsten Loesing
8e2640b15a
Update geoip and geoip6 to the March 3 2016 database.
2016-03-04 10:56:51 +01:00
Nick Mathewson
740421af19
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-02-11 13:00:25 -05:00
Nick Mathewson
ce289e2cb5
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-02-11 12:55:40 -05:00
Nick Mathewson
ad95d64fec
Merge branch 'bug18162_024' into maint-0.2.4
2016-02-11 12:55:25 -05:00
Nick Mathewson
44ad3be221
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-02-05 08:13:24 -05:00
Nick Mathewson
f06d9a9cef
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-02-05 08:13:13 -05:00
Karsten Loesing
d5ac79e056
Update geoip and geoip6 to the February 2 2016 database.
2016-02-04 08:53:24 +01:00
Nick Mathewson
bca7083e82
avoid integer overflow in and around smartlist_ensure_capacity.
...
This closes bug 18162; bugfix on a45b131590#18162 issues, this fixes a signed integer overflow
in smarltist_add_all(), which is probably not so great either.
2016-01-27 12:32:41 -05:00
teor (Tim Wilson-Brown)
db81565331
Make memwipe() do nothing when passed a NULL pointer or zero size
...
Check size argument to memwipe() for underflow.
Closes bug #18089 . Reported by "gk", patch by "teor".
Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352 ),
commit 49dd5ef3
2016-01-18 19:58:07 -05:00
Nick Mathewson
c7b0cd9c2f
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-01-07 09:41:36 -08:00
Nick Mathewson
9ca329581a
Merge branch 'maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2016-01-07 09:40:23 -08:00
teor (Tim Wilson-Brown)
11f63d26ac
Update dannenberg's V3 authority identity fingerprint
...
This new identity key was changed on 18 November 2015.
2016-01-07 09:39:04 -08:00
Nick Mathewson
400df18688
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-01-07 09:14:05 -08:00
Nick Mathewson
ae223138fb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-01-07 09:13:54 -08:00
Karsten Loesing
1496056c12
Update geoip and geoip6 to the January 5 2016 database.
2016-01-07 11:10:37 +01:00
Nick Mathewson
1adc2bf66f
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-08 10:20:21 -05:00
Nick Mathewson
c3d11b119d
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-08 10:20:14 -05:00
Arlo Breault
5138f5ca69
Ensure node is a guard candidate when picking a directory guard
2015-12-08 09:49:01 -05:00
Nick Mathewson
b53ff86067
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-08 09:43:25 -05:00
Nick Mathewson
4328525770
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-08 09:38:48 -05:00
Nick Mathewson
b0867fec96
Fix a compilation warning introduced by clang 3.6
...
There was a dead check when we made sure that an array member of a
struct was non-NULL. Tor has been doing this check since at least
0.2.3, maybe earlier.
Fixes bug 17781.
2015-12-08 09:37:05 -05:00
Nick Mathewson
089ee13534
Merge branch 'maint-0.2.5' into maint-0.2.6
2015-12-07 10:10:44 -05:00
Nick Mathewson
e8e89fd7a1
Merge branch 'maint-0.2.4' into maint-0.2.5
2015-12-07 10:10:21 -05:00
Karsten Loesing
dbb919cf94
Update geoip and geoip6 to the December 1 2015 database.
2015-12-05 17:02:59 +01:00
Nick Mathewson
35bf07b8d6
Check for len < 4 in dn_indicates_v3_cert
...
Without this check, we potentially look up to 3 characters before
the start of a malloc'd segment, which could provoke a crash under
certain (weird afaik) circumstances.
Fixes 17404; bugfix on 0.2.6.3-alpha.
2015-10-21 11:44:43 -04:00
David Goulet
2ec5e24c58
Add hidserv-stats filname to our sandbox filter
...
Fixes #17354
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-10-15 13:42:34 -04:00
Nick Mathewson
552136668c
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-10-09 10:14:46 -04:00
Nick Mathewson
3569cffe14
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-10-09 10:12:59 -04:00
Karsten Loesing
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
Nick Mathewson
fb5a858a35
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-09-24 10:06:15 -04:00
Nick Mathewson
809217e6f3
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-09-24 10:06:00 -04:00
Karsten Loesing
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
Nick Mathewson
9d86f6665a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-07-29 10:48:13 -04:00
Nick Mathewson
01bb260f31
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-07-29 10:47:07 -04:00
Karsten Loesing
7004d67430
Update geoip and geoip6 to the July 8 2015 database.
2015-07-29 15:49:04 +02:00
Nick Mathewson
418b6f8197
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-25 11:43:17 -04:00
Nick Mathewson
fd082c394b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-06-25 11:43:04 -04:00
Nick Mathewson
fde4199e1c
Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4
2015-06-25 11:42:47 -04:00
Nick Mathewson
cb8c5c023f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-06-25 11:42:31 -04:00
Nick Mathewson
1c1d71fe1a
Merge remote-tracking branch 'public/bug16013_025' into maint-0.2.6
2015-06-25 11:14:44 -04:00
Nick Mathewson
68eaaed798
Avoid crashing on busy/NEWNYM+hidden service clients
...
When we ran out of intro points for a hidden service (which could
happen on a newnym), we would change the connection's state back to
"waiting for hidden service descriptor." But this would make an
assertion fail if we went on to call circuit_get_open_circ_or_launch
again.
This fixes bug 16013; I believe the bug was introduced in
38be533c69
2015-06-25 11:10:43 -04:00
Nick Mathewson
03e3cf6a7a
Merge remote-tracking branch 'public/bug16400_026' into maint-0.2.6
2015-06-25 10:40:58 -04:00
Nick Mathewson
e0b7598833
Repair breakage in early-error case of microdesc parsing
...
When I fixed #11243 , I made it so we would take the digest of a
descriptor before tokenizing it, so we could desist from download
attempts if parsing failed. But when I did that, I didn't remove an
assertion that the descriptor began with "onion-key". Usually, this
was enforced by "find_start_of_next_microdescriptor", but when
find_start_of_next_microdescriptor returned NULL, the assertion was
triggered.
Fixes bug 16400. Thanks to torkeln for reporting and
cypherpunks_backup for diagnosing and writing the first fix here.
2015-06-22 13:51:56 -04:00
Nick Mathewson
f18ee7fc72
Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6
2015-06-18 11:30:01 -04:00
Nick Mathewson
c8cb55659a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-06-17 09:18:45 -04:00
teor
75388f67c0
Correctly handle failed crypto_early_init
...
If crypto_early_init fails, a typo in a return value from tor_init
means that tor_main continues running, rather than returning
an error value.
Fixes bug 16360; bugfix on d3fb846d8c#4900 .
Patch by "teor".
2015-06-17 09:18:32 -04:00
David Goulet
8acf5255c2
Revert "Do not replace a HS descriptor with a different replica of itself"
...
This reverts commit 9407040c59
2015-06-16 13:41:42 -04:00
Nick Mathewson
59fa0c2d99
Fix another seccomp2 issue
...
Allow pipe() and pipe2() syscalls; we need these when eventfd2()
support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha. Patch
from "teor".
2015-06-15 10:13:11 -04:00
Karsten Loesing
08e14e1448
Update geoip6 to the June 3 2015 database.
2015-06-09 16:28:48 +02:00
Karsten Loesing
e5907e94c2
Update geoip to the June 3 2015 database.
2015-06-09 16:26:10 +02:00
David Goulet
6785f0b65a
HSDir flag now requires the Stable flag
...
Fixes #8243
2015-06-08 10:28:35 -04:00
Yawning Angel
f2ff814582
Set session_group after the port's data structure has been populated.
...
Fixes #16247 , patch by "jojelino".
2015-06-04 13:53:35 +00:00
Peter Palfrader
a68e5323f8
Fix sandboxing to work when running as a relay
...
This includes correctly allowing renaming secret_id_key and allowing the
eventfd2 and futex syscalls. Fixes bug 16244; bugfix on 0.2.6.1-alpha.
2015-06-02 14:20:01 -04:00
Nick Mathewson
97330ced0c
Fix sandbox use with systemd. bug 16212.
2015-05-28 14:05:46 -04:00
Nick Mathewson
8ca3773f68
Fix unit tests on MSVC2013.
...
Patch from "NewEraCracker." Fixes bug16030; bugfix on 0.2.6.2-alpha.
2015-05-26 10:34:07 -04:00
Nick Mathewson
08e8c21b1f
Fix --enable-systemd builds on systems with libsystemd but not systemd
...
Fixes bug 16164; bugfix on 0.2.6.3-alpha. Patch from Peter Palfrader.
2015-05-26 09:39:53 -04:00
Nick Mathewson
614d9bc967
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-05-13 11:05:33 -04:00
John Brooks
2b27ce52d2
Fix out-of-bounds read in INTRODUCE2 client auth
...
The length of auth_data from an INTRODUCE2 cell is checked when the
auth_type is recognized (1 or 2), but not for any other non-zero
auth_type. Later, auth_data is assumed to have at least
REND_DESC_COOKIE_LEN bytes, leading to a client-triggered out of bounds
read.
Fixed by checking auth_len before comparing the descriptor cookie
against known clients.
Fixes #15823 ; bugfix on 0.2.1.6-alpha.
2015-05-05 15:05:32 -04:00
David Goulet
26c344a563
Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"
...
Fixes #15850 , part of #15801 . Change file is added by this commit. The
original comment in the reverted commit is removed because right now we
*need* a DirPort until #15849 is implemented so no doubt nor confusion there
anymore.
This reverts commit 80bed1ac96
2015-04-28 14:30:07 -04:00
Nick Mathewson
0ac748353a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-27 14:18:16 -04:00
Nick Mathewson
6c7720ed49
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-27 14:16:55 -04:00
Nick Mathewson
efae1bcef6
Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4
2015-04-27 14:15:58 -04:00
Nick Mathewson
609cdec112
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-04-27 14:15:44 -04:00
Karsten Loesing
b5f6495876
Update geoip6 to the April 8 2015 database.
2015-04-24 17:51:36 +02:00
Karsten Loesing
bcc0a48cfe
Update geoip to the April 8 2015 database.
2015-04-24 17:49:45 +02:00
Nick Mathewson
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
Nick Mathewson
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
Nick Mathewson
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
Yawning Angel
49ddd92c11
Validate the RSA key size received when parsing INTRODUCE2 cells.
...
Fixes bug 15600; reported by skruffy
2015-04-06 09:18:17 -04:00
George Kadianakis
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
Nick Mathewson
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
Nick Mathewson
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
Nick Mathewson
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
George Kadianakis
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
Nick Mathewson
c113544a94
Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
2015-03-23 09:25:15 -04:00
Yawning Angel
732f522a42
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.
2015-03-23 09:20:02 -04:00
Nick Mathewson
b78803f9f5
Extract main part of main loop into a separate function
...
For 15176; Shadow would like this.
Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
2015-03-14 14:28:29 -04:00
Nick Mathewson
eb68ea20f8
Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6
2015-03-12 13:15:08 -04:00
Yawning Angel
b3281fc6d6
Initialize the extorport auth cookie before launching PTs.
...
PTs expect the auth cookie to be available immedieately after launch,
leading to a race condition when PTs opt to cache the extorport cookie
once immediately after startup.
Fixes #15240 .
2015-03-12 13:12:56 -04:00
Nick Mathewson
9063f29160
Revert "Make TransProxyType ipfw work correctly"
...
This reverts commit 681802817d#15205 on it.)
2015-03-12 12:49:08 -04:00
Nick Mathewson
eecd410984
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5
2015-03-12 12:27:25 -04:00
Nick Mathewson
66c8180207
Fix crash bug when calling cpuworkers_rotate_keyinfo on a client.
...
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
2015-03-12 11:14:39 -04:00
Nick Mathewson
192ed94410
Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash
...
When calling pthread_attr_setdetachstate, we were using 1 as the
argument. But the pthreads documentation says that you have to say
PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40. Calling
pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS.
(Because we're so late in the release cycle, I made the code define
PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to
break any other platforms.)
This bug was introduced when we made threading mandatory in
0.2.6.1-alpha; previously, we had force-disabled threading on
Solaris. See #9495 discussion.
2015-03-12 10:03:02 -04:00
Nick Mathewson
d29a8ad564
Add link protocol version counts to the heartbeat message
...
Closes ticket 15212
2015-03-10 10:07:41 -04:00
Nick Mathewson
1af67d7f72
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
2015-03-09 19:47:12 -04:00
Nick Mathewson
7c9be64e1a
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 16:25:11 -04:00
Nick Mathewson
306f2f0eff
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-03-09 16:24:44 -04:00
Nick Mathewson
220e9be095
Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
2015-03-09 16:24:07 -04:00
Nick Mathewson
5588e677bd
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-03-09 16:23:55 -04:00
Karsten Loesing
62714068d9
Update geoip6 to the March 3 2015 database.
2015-03-09 21:11:52 +01:00
Karsten Loesing
beda8d2934
Update geoip to the March 3 2015 database.
2015-03-09 21:09:44 +01:00
Nick Mathewson
24c031b1a2
Don't use checked strl{cat,cpy} on OSX.
...
There is a bug in the overlap-checking in strlcat that can crash Tor
servers. Fixes bug 15205; this is an OSX bug, not a Tor bug.
2015-03-09 15:09:49 -04:00
Nick Mathewson
c066f2d30b
We actually merged this one a while ago.
2015-03-09 13:49:55 -04:00
Nick Mathewson
8450f6e9a0
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-03-09 13:21:20 -04:00
Nick Mathewson
448bd22092
Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5
2015-03-09 13:17:20 -04:00
Nick Mathewson
62631904cb
GETINFO bw-event-cache to get information on recent BW events
...
Closes 14128; useful to regain functionality lost because of 13988.
2015-03-09 13:13:56 -04:00
Nick Mathewson
e3408248b9
Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5
2015-03-09 13:12:54 -04:00
