Nick Mathewson
ce854a8d22
Add -ftrapv to gcc-hardening ... mostly!
...
We know there are overflows in curve25519-donna-c32, so we'll have
to have that one be fwrapv.
Only apply the asan, ubsan, and trapv options to the code that does
not need to run in constant time. Those options introduce branches
to the code they instrument.
(These introduced branches should never actually be taken, so it
might _still_ be constant time after all, but branch predictors are
complicated enough that I'm not really confident here. Let's aim for
safety.)
Closes 17983.
2016-05-12 11:21:28 -04:00
Nick Mathewson
bd34edc18d
Merge remote-tracking branch 'sebastian/stemtest'
2016-04-12 13:13:15 -04:00
Nick Mathewson
eafcd7b0fc
Merge branch 'maint-0.2.8'
2016-04-12 13:02:37 -04:00
Nick Mathewson
7babf33239
Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
2016-04-12 13:02:02 -04:00
Nick Mathewson
39c057d45a
memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
...
Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was
introduced. Found by wbenny.
2016-04-07 11:10:14 -04:00
Nick Mathewson
591029253f
Merge branch 'bug14334_squashed'
2016-04-07 10:59:55 -04:00
George Kadianakis
d5acb633ae
Don't mark guards as unreachable if connection_connect() fails.
2016-04-07 10:59:46 -04:00
David Goulet
40827da3bf
Turn TestingClientBootstrap* into non-testing options
...
This changes simply renames them by removing "Testing" in front of them and
they do not require TestingTorNetwork to be enabled anymore.
Fixes #18481
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2016-04-07 10:57:59 -04:00
Nick Mathewson
7532cd439b
When we get a bad nickname, explain what a good one is.
...
Closes #18300 ; patch from "icanhasaccount".
2016-04-07 10:54:53 -04:00
Nick Mathewson
e703484722
Merge branch 'maint-0.2.8'
2016-04-07 10:46:15 -04:00
Nick Mathewson
d8a056daed
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-04-07 10:46:07 -04:00
Nick Mathewson
ad4ff7a5b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-04-07 10:45:46 -04:00
Nick Mathewson
2ce99b9f48
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-04-07 10:45:38 -04:00
Nick Mathewson
34a51d1621
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-04-07 10:45:32 -04:00
Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
d5b3679392
Merge branch 'maint-0.2.8'
2016-04-05 23:56:21 -04:00
Nick Mathewson
f6ffe532ab
Merge branch 'bug18728_028' into maint-0.2.8
2016-04-05 23:56:05 -04:00
Nick Mathewson
d7a0382ba3
Don't call the system toupper or tolower.
...
Yes, we could cast to unsigned char first, but it's probably safest
to just use our own (in test_util), or remove bad-idea features that
we don't use (in readpassphrase.c).
Fixes 18728.
2016-04-05 23:22:28 -04:00
Nick Mathewson
20d39e86af
Merge branch 'maint-0.2.8'
2016-04-05 23:18:48 -04:00
Roger Dingledine
d037369e56
quiet debug logs from periodic_event_dispatch()
...
Stop blasting twelve lines per second from periodic_event_dispatch()
at loglevel debug.
Resolves ticket 18729; fix on 0.2.8.1-alpha.
2016-04-05 23:13:55 -04:00
Nick Mathewson
b46d126e64
Merge branch 'maint-0.2.8'
2016-04-05 10:38:53 -04:00
Nick Mathewson
967491f156
Only define NEW_THREAD_API when not building with LibreSSL.
2016-04-05 10:38:15 -04:00
Nick Mathewson
16f7851807
Merge remote-tracking branch 'teor/bug18720'
2016-04-05 10:08:11 -04:00
Nick Mathewson
6720628c97
Merge branch 'maint-0.2.8'
2016-04-05 10:06:18 -04:00
Yawning Angel
92ae6b9524
Add a changes file for the OpenSSL 1.1.0 compilation fixes.
2016-04-05 10:03:25 -04:00
Yawning Angel
5db21f8f81
OpenSSL 1.1.0-pre5-dev and later made BIO opaque.
...
Detect newer versions and fix our TLS code to use the new API.
2016-04-05 10:03:24 -04:00
Yawning Angel
6729d7328c
OpenSSL 1.1.0-pre4 and later(?) have a new "thread API".
...
It appears that setting the various callbacks is no longer required, so
don't.
2016-04-05 10:03:24 -04:00
teor (Tim Wilson-Brown)
6a2b4db4f9
Fix a comment typo in compat.h
2016-04-05 13:45:37 +10:00
teor (Tim Wilson-Brown)
5d2b1c784b
Clarify comments on connection_t's address fields
2016-04-05 13:45:09 +10:00
Nick Mathewson
705d3b221e
Merge branch 'incoming_queue_symbol_fix'
2016-04-01 14:16:49 -04:00
Nick Mathewson
4b3e6c4d43
Merge branch 'maint-0.2.8'
2016-04-01 08:18:03 -04:00
Nick Mathewson
fdb57db581
Merge branch 'bug18133_027' into maint-0.2.8
2016-04-01 08:17:56 -04:00
Nick Mathewson
4093f343ca
fix indentation
2016-04-01 08:16:21 -04:00
Nick Mathewson
9e57ffa520
Merge branch 'maint-0.2.8'
2016-04-01 08:15:05 -04:00
Nick Mathewson
e247093e0e
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
2016-04-01 08:10:58 -04:00
Andrea Shepard
183d465f0e
Merge branch 'bug15221_027' into maint-0.2.7
2016-03-30 12:23:42 +00:00
Nick Mathewson
beba70ec77
Don't declare "incoming_queue" in every file including channel.h
...
Found with my wacky symbol-usage-enforcer.
2016-03-29 13:55:14 -04:00
Andrea Shepard
0b45cab147
Merge branch 'bug18570_027' into maint-0.2.7
2016-03-29 15:01:36 +00:00
Roger Dingledine
93c311daa8
majority of four is, alas, three
2016-03-29 10:57:01 -04:00
Roger Dingledine
1103d82492
fix typo in comment
2016-03-29 10:56:26 -04:00
Andrea Shepard
1218d731d1
Merge branch 'bug16248_027' into maint-0.2.7
2016-03-29 14:33:45 +00:00
Nick Mathewson
4e76b206b5
Merge remote-tracking branch 'arma/feature18624'
2016-03-29 08:06:21 -04:00
Nick Mathewson
e1f4d9552e
Faravahar also versions.
2016-03-29 07:55:02 -04:00
Nick Mathewson
90c24c0ced
Merge branch 'maint-0.2.8'
2016-03-28 20:09:22 -04:00
Nick Mathewson
ba87f5bb25
Fix my dumb unreleased bug in 18673
2016-03-28 20:09:09 -04:00
Nick Mathewson
055a7a198a
Rename tor_dup_addr to tor_addr_to_str_dup.
...
Patch from icanhasaccount; closes 18462.
2016-03-28 16:36:51 -04:00
Nick Mathewson
3220bd816b
Merge branch 'maint-0.2.8'
2016-03-28 16:14:21 -04:00
Nick Mathewson
f780d196a9
Merge branch 'bug18673_028_v2' into maint-0.2.8
2016-03-28 16:13:39 -04:00
Nick Mathewson
79e534859b
Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8
2016-03-28 16:13:02 -04:00
Nick Mathewson
c8eb39d67f
Remove a couple of redundant lines from the makefile
...
Fixes the last case of 17744.
2016-03-28 16:11:25 -04:00
