7059c32968
Merge branch 'maint-0.4.3'
2020-03-18 08:20:38 -04:00
84f57b69f3
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-18 08:20:16 -04:00
758deaa472
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-18 08:20:16 -04:00
4ad3f17c26
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-18 08:20:16 -04:00
0526801ed4
Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.
2020-03-18 08:19:48 -04:00
3d8c97a988
Merge branch 'maint-0.4.3'
2020-03-17 15:22:36 -04:00
e0d68ce84f
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 15:22:36 -04:00
85141a3a74
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 15:22:36 -04:00
3c8a4b8fbd
Merge branch 'trove_2020_002_041' into maint-0.4.1
2020-03-17 15:22:02 -04:00
fe3d8ec38e
Merge branch 'trove_2020_002_035' into maint-0.3.5
2020-03-17 15:21:48 -04:00
270fe01557
Merge branch 'maint-0.4.3'
2020-03-17 11:47:35 -04:00
e15a621ac8
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-17 11:45:16 -04:00
5f4e14b8c8
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-17 11:45:16 -04:00
bbc80ea042
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-03-17 11:45:16 -04:00
c940b7cf13
Trivial bugfixes found during TROVE investigation.
2020-03-17 11:43:03 -04:00
9163781039
Merge branch 'trove_2020_002_035' into trove_2020_002_041
2020-03-17 10:45:03 -04:00
f958b537ab
Use >= consistently with max_bits.
2020-03-17 10:44:38 -04:00
8abdb39489
Extract key length check into a new function, and check more fields.
...
In the openssl that I have, it should be safe to only check the size
of n. But if I'm wrong, or if other openssls work differently, we
should check whether any of the fields are too large.
Issue spotted by Teor.
2020-03-17 10:44:38 -04:00
9c73f5adc4
Run "make autostyle"
2020-03-17 18:19:04 +10:00
dd6e2277e0
Merge branch 'trove_2020_002_035' into trove_2020_002_041
2020-03-14 14:20:51 -04:00
29c9675bde
Fix memory leak in crypto_pk_asn1_decode_private.
...
(Deep, deep thanks to Taylor for reminding me to test this!)
2020-03-14 14:17:37 -04:00
be064f77b9
Revise TROVE-2020-002 fix to work on older OpenSSL versions.
...
Although OpenSSL before 1.1.1 is no longer supported, it's possible
that somebody is still using it with 0.3.5, so we probably shouldn't
break it with this fix.
2020-03-14 13:38:53 -04:00
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-13 16:46:16 -04:00
6ed2c9e5fa
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-03-13 16:46:16 -04:00
b9d71f3848
Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5
2020-03-13 16:46:09 -04:00
05aab3fd21
Merge branch 'maint-0.4.3'
2020-03-10 09:14:44 -04:00
f89c32ccd0
Document poll_interval_tv in procmon.c
2020-03-10 09:13:22 -04:00
2d53168511
Merge branch 'tor-github/pr/1723'
2020-03-09 10:36:05 -04:00
7177eeddf1
Merge branch 'maint-0.4.3'
2020-03-05 08:48:40 -05:00
686494f0f7
Merge branch 'clang_format_prep_3'
2020-03-05 08:23:32 -05:00
2c792d1e0e
In typed_var_kvassign, include config names in error messages.
...
This should improve the usability of our configuration error messages.
2020-02-26 14:18:40 -05:00
7e7aff9b6a
confmgt: when a units value is invalid, include a meaningful error.
...
Part of 33460.
2020-02-26 13:03:10 -05:00
b133325a3e
confmgt: when an int/enum value is invalid, say which values are ok.
...
Part of 33460.
2020-02-26 13:02:28 -05:00
d4d5d9d1d1
Merge branch 'ticket33316_squashed'
2020-02-24 07:49:45 -05:00
e067cb426a
Move process subsystem after evloop.
...
Process uses evloop, and so should be initialized after it.
2020-02-24 07:49:39 -05:00
90524de0b2
Move winprocess_sys into a new low-level hardening module
...
This code was in our process module, but it doesn't belong there:
process is for launching and monitoring subprocesses, not for
hardening the current process.
This change lets us have our subsystem init order more closely match
our dependency order.
2020-02-24 07:49:39 -05:00
caa392a73a
Merge remote-tracking branch 'tor-github/pr/1685/head'
2020-02-24 07:45:20 -05:00
691d271b2e
Re-order thread initialization to follow logging, and remove a comment.
...
lib/log no longer uses lib/thread; lib/log only uses lib/lock, which
is at a lower level.
2020-02-13 12:55:05 -05:00
67d59d7d1f
Re-order most subsystems to correspond to dependency order.
2020-02-13 12:53:15 -05:00
e849881d3a
Run "make autostyle"
...
But only take the changes that were caused by the rest of the 33087
branch.
Part of 33087.
2020-02-13 09:28:21 +10:00
e231d84dd5
Merge branch 'maint-0.4.3'
2020-02-12 18:26:08 -05:00
d0c3350218
Run "make autostyle".
2020-02-12 18:25:51 -05:00
8a23393eda
log: Stop duplicating error file fds
...
Since we're not closing these fds, they don't need to be duplicated
any more.
Cleanup after 33087.
2020-02-13 00:01:47 +10:00
3d1ef3b6f8
err/log: Stop closing stderr and stdout during shutdown
...
Closing these file descriptors can hide sanitiser logs.
Instead, flush the logs before tor exits, using fsync().
Some Windows environments don't have fsync(), so we check
for it at compile time.
Fixes bug 33087; bugfix on 0.4.1.6.
2020-02-13 00:00:41 +10:00
384a771fcc
Merge branch 'ticket32362_squashed'
2020-02-11 08:47:19 -05:00
777d90fa23
Check for leading zeros in tor_inet_aton()
2020-02-11 08:47:13 -05:00
901ed35709
Make n_subcredentials a size_t .
...
Based on David's review.
2020-02-11 02:13:40 +02:00
d9e211ab70
Use semicolons after HT_PROTOTYPE and HT_GENERATE.
2020-02-10 12:54:43 -05:00
fbc1eaa0af
Try to shorten an #error in address.c
2020-02-06 17:21:34 -05:00
8a5a1600cd
Extract verbatim table in uname.c
2020-02-06 17:06:12 -05:00
Nick Mathewson
George Kadianakis
teor
David Goulet
rl1987
Neel Chauhan