Nick Mathewson
4bcec3bab5
Merge branch 'maint-0.2.8'
...
'ours' merge to avoid bumping version.
2016-06-15 12:55:54 -04:00
Nick Mathewson
2042080b21
ondrej is no longer making rpms
2016-06-15 12:55:40 -04:00
Nick Mathewson
e718a582af
Bump to 0.2.8.4-rc-dev
2016-06-15 12:55:17 -04:00
David Goulet
c7f1b46a10
Perform cache lookup when FetchHidServDescriptors is set
...
The FetchHidServDescriptors check was placed before the descriptor cache
lookup which made the option not working because it was never using the
cache in the first place.
Fixes #18704
Patched-by: twim
Signef-off-by: David Goulet <dgoulet@torproject.org>
2016-06-15 10:04:07 -04:00
Nick Mathewson
657067ef9d
Merge branch 'maint-0.2.8'
...
This is an "ours" merge to avoid taking a version bump.
2016-06-14 20:36:54 -04:00
Nick Mathewson
3a0d42fbf9
bump version to 0.2.8.4-rc
2016-06-14 20:36:35 -04:00
Nick Mathewson
05e2750ea7
whoops; blank line
2016-06-14 20:21:59 -04:00
Nick Mathewson
227d3b3d6b
Use ENABLE/DISABLE_GCC_WARNING in masater.
2016-06-14 20:21:02 -04:00
Nick Mathewson
8486dea8d7
Merge branch 'maint-0.2.8'
2016-06-14 20:16:46 -04:00
Nick Mathewson
d6b01211b9
Resolve the remaining openssl "-Wredundant-decls" warnings.
...
Another part of 19406
2016-06-14 20:14:53 -04:00
Nick Mathewson
e54f8e3429
Remove some duplicated warnings from the big list
2016-06-14 19:28:56 -04:00
Nick Mathewson
99a7ddd6f9
Disable -Wc99-c11-compat
...
It triggers on the openssl headers, and doesn't seem to actually
help us.
2016-06-14 13:28:43 -04:00
Nick Mathewson
3bffdf05d1
use new-form macros to disable -Wredundant-decls
2016-06-14 12:22:52 -04:00
Nick Mathewson
df4fa92a88
Merge branch 'maint-0.2.8'
2016-06-14 12:17:24 -04:00
Nick Mathewson
71aacbe427
Suppress the Wredundant-decls warning in another set of openssl headers
2016-06-14 12:17:02 -04:00
Yawning Angel
b217e4ac65
Bug 19406: Add a changes file.
2016-06-14 12:13:09 -04:00
Yawning Angel
c5e2f7b944
Bug 19406: Fix the unit tests to work with OpenSSL 1.1.x
...
Just as it says on the tin. Don't need to fully disable any tests and
reduce coverage either. Yay me.
2016-06-14 12:13:09 -04:00
Yawning Angel
6ddef1f7e0
Bug 19406: OpenSSL removed SSL_R_RECORD_TOO_LARGE in 1.1.0.
...
This is a logging onlu change, we were suppressing the severity down to
INFO when it occured (treating it as "Mostly harmless"). Now it is no
more.
2016-06-14 12:13:09 -04:00
Yawning Angel
b563a3a09d
Bug 19406: OpenSSL made RSA and DH opaque in 1.1.0.
...
There's accessors to get at things, but it ends up being rather
cumbersome. The only place where behavior should change is that the
code will fail instead of attempting to generate a new DH key if our
internal sanity check fails.
Like the previous commit, this probably breaks snapshots prior to pre5.
2016-06-14 12:13:09 -04:00
Yawning Angel
86f0b80681
Bug 19406: OpenSSL changed the Thread API in 1.1.0 again.
...
Instead of `ERR_remove_thread_state()` having a modified prototype, it
now has the old prototype and a deprecation annotation. Since it's
pointless to add extra complexity just to remain compatible with an old
OpenSSL development snapshot, update the code to work with 1.1.0pre5
and later.
2016-06-14 12:13:09 -04:00
Nick Mathewson
a427a7c479
Merge branch 'maint-0.2.8'
2016-06-13 14:21:47 -04:00
Nick Mathewson
60b8aaefa1
lintChanges fixes
2016-06-13 13:57:03 -04:00
Nick Mathewson
4c90cdc0e7
Coverity dislikes (double) (int/int).
...
When you divide an int by an int and get a fraction and _then_ cast
to double, coverity assumes that you meant to cast to a double
first.
In my fix for -Wfloat-conversion in 493499a339
, I
did something like this that coverity didn't like.
Instead, I'm taking another approach here.
Fixes CID 1232089, I hope.
2016-06-13 11:25:19 -04:00
Nick Mathewson
6a7d11f38a
Merge branch 'maint-0.2.8'
2016-06-13 10:49:24 -04:00
Nick Mathewson
2ee3dbe801
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-06-13 10:49:05 -04:00
Nick Mathewson
80089c9e7c
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-06-13 10:48:56 -04:00
Nick Mathewson
b4bb88606e
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-06-13 10:48:48 -04:00
Nick Mathewson
f25f7b759c
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-06-13 10:48:35 -04:00
Andrea Shepard
925f76b486
Keep make check-spaces happy
2016-06-12 21:47:14 +00:00
Roger Dingledine
0616fd6fb6
typo/comment/log fixes i found in my sandbox from montreal
2016-06-12 16:14:15 -04:00
Karsten Loesing
c14c662758
Update geoip and geoip6 to the June 7 2016 database.
2016-06-12 11:35:50 +02:00
Nick Mathewson
80f2c3555d
Remove -Wc11-extensions
...
FreeBSD uses _Generic() in its system headers, and is within its
rights to do so.
2016-06-11 17:37:34 -04:00
Nick Mathewson
47edbd4fad
Fix build on 32-bit systems.
2016-06-11 13:26:05 -04:00
Nick Mathewson
cb71c5ddbb
Whoops -- this got lost in the merge.
2016-06-11 12:58:24 -04:00
Nick Mathewson
841d1b2555
Merge branch 'maint-0.2.8'
2016-06-11 10:16:17 -04:00
Nick Mathewson
ada5668c5e
Merge remote-tracking branch 'public/bug19203_027' into maint-0.2.8
2016-06-11 10:16:00 -04:00
Nick Mathewson
d6b2af7a3a
Merge branch 'bug19180_easy_squashed'
2016-06-11 10:15:40 -04:00
Nick Mathewson
e80a032b61
Add clang's -Wstring-conversion, and fix the one place it hits
2016-06-11 10:11:54 -04:00
Nick Mathewson
53a3b39da1
Add -Wmissing-variable-declarations, with attendant fixes
...
This is a big-ish patch, but it's very straightforward. Under this
clang warning, we're not actually allowed to have a global variable
without a previous extern declaration for it. The cases where we
violated this rule fall into three roughly equal groups:
* Stuff that should have been static.
* Stuff that was global but where the extern was local to some
other C file.
* Stuff that was only global when built for the unit tests, that
needed a conditional extern in the headers.
The first two were IMO genuine problems; the last is a wart of how
we build tests.
2016-06-11 10:11:54 -04:00
Nick Mathewson
80f1a2cbbd
Add the -Wextra-semi warning from clang, and fix the cases where it triggers
2016-06-11 10:11:54 -04:00
Nick Mathewson
c3adbf755b
Resolve some warnings from OSX clang.
2016-06-11 10:11:53 -04:00
Nick Mathewson
26e979b342
Add all the clang-only warnings that do not trigger now
2016-06-11 10:11:53 -04:00
Nick Mathewson
15533c8897
Set our autoconf-breaking options last, not before we check for others
2016-06-11 10:11:53 -04:00
Nick Mathewson
9bbd6502f0
Use autoconf, not gcc version, to decide which warnings we have
...
This gives more accurate results under Clang, which can only help us
detect more warnings in more places.
Fixes bug 19216; bugfix on 0.2.0.1-alpha
2016-06-11 10:11:53 -04:00
Nick Mathewson
ad16c55286
Use -Wstrict-overflow=2 on gcc5+.
2016-06-11 10:11:53 -04:00
Nick Mathewson
4caed2424a
Enable -Woverlength-strings for GCC>=4.6 on MOST of the code.
...
IMO it's fine for us to make exceptions to this rule in the unit
tests, but not in the code at large.
2016-06-11 10:11:52 -04:00
Nick Mathewson
8f2d2933f9
Use -Wdouble-promotion in GCC >= 4.6
...
This warning triggers on silently promoting a float to a double. In
our code, it's just a sign that somebody used a float by mistake,
since we always prefer double.
2016-06-11 10:11:52 -04:00
Nick Mathewson
493499a339
Add -Wfloat-conversion for GCC >= 4.9
...
This caught quite a few minor issues in our unit tests and elsewhere
in our code.
2016-06-11 10:11:52 -04:00
Nick Mathewson
2ff20c93a5
Add -Wunused-const-variable=2 on GCC >=6.1
...
This caused a trivial warning in curve25519-donna-64bit.h, which
had two unused constants. I commented them out.
2016-06-11 10:11:52 -04:00
Nick Mathewson
12517c7303
Add -Wduplicated-cond on GCC 6
2016-06-11 10:11:52 -04:00