e05304902c
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-18 12:18:31 -04:00
cb69a5a118
Merge branch 'maint-0.3.5' into maint-0.4.1
...
"ours" to avoid version bump.
2020-03-18 12:16:59 -04:00
efdbf42432
Bump version to 0.4.1.9-dev
2020-03-18 12:15:53 -04:00
3150c30351
Bump version to 0.3.5.10-dev
2020-03-18 12:15:32 -04:00
93ed011a26
Pick release date, copy changelog to releasenotes.
2020-03-18 09:06:12 -04:00
4ad3f17c26
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-18 08:20:16 -04:00
9bbf8c368f
Merge branch 'maint-0.4.1' into release-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
1b0322bb4d
fold in changelog and blurb for trove-2020-002
2020-03-17 15:37:45 -04:00
57b1d0848e
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-17 15:22:36 -04:00
80fb91d14e
Merge branch 'maint-0.4.1' into release-0.4.1
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
055c5732c4
Light changelog edits
2020-03-17 15:03:03 -04:00
14a5ea2456
Construct initial 0.4.1.9 changelog.
2020-03-17 14:51:42 -04:00
c1560f6513
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-17 13:56:10 -04:00
cec647ff3e
Merge branch 'trove_2020_004_041_v2' into maint-0.4.1
2020-03-17 13:56:03 -04:00
6031aa45fa
Merge branch 'maint-0.4.1' into release-0.4.1
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
089e57d22f
Fix TROVE-2020-003.
...
Given that ed25519 public key validity checks are usually not needed
and (so far) they are only necessary for onion addesses in the Tor
protocol, we decided to fix this specific bug instance without
modifying the rest of the codebase (see below for other fix
approaches).
In our minimal fix we check that the pubkey in
hs_service_add_ephemeral() is valid and error out otherwise.
2020-03-17 11:44:45 -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
2328c79a5f
Add off-by-one checks for key length.
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
78bcfc1280
circpad_setup_machine_on_circ(): exit early on error.
...
This function does a nonfatal assertion to make sure that a machine
is not registered twice, but Tobias Pulls found a case where it
happens. Instead, make the function exit early so that it doesn't
cause a remotely triggered memory leak.
Fixes bug 33619; bugfix on 0.4.0.1-alpha. This is also tracked as
TROVE-2020-004.
2020-03-16 17:59:57 -04:00
4f2257477c
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-16 20:54:24 +10:00
c22696e360
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-03-16 20:54:20 +10:00
1c688ba925
Travis: Produce detailed chutney diagnostics
...
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
2020-03-16 16:04:51 +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
ab2e66ccdc
Add a test for crypto_pk_asn1_decode_private maxbits.
2020-03-14 14:17:13 -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
65187d9de7
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-13 16:57:42 -04:00
7a9e2a261b
Merge branch 'maint-0.3.5' into maint-0.4.1
...
"ours" to avoid version bump.
2020-03-13 16:56:44 -04:00
d17108a187
Bump to 0.3.5.10
2020-03-13 16:56:31 -04:00
7f0ad3343e
Bump to 0.4.1.9
2020-03-13 16:56:22 -04:00
3868769714
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-13 16:46:16 -04:00
b2e543bfe7
Merge branch 'maint-0.3.5' into maint-0.4.1
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
f141b861a8
Merge branch 'maint-0.4.1' into release-0.4.1
2020-03-13 13:01:19 +10:00
c96cf14943
Merge branch 'bug33195_035' into bug33195_041
...
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
2020-02-13 13:55:55 +10:00
add387c507
Travis: Sort jobs in order of speed
...
Putting the slowest jobs first takes full advantage of Travis
concurrency.
Closes 33194.
2020-02-13 13:52:41 +10:00
fc3555100f
Travis: Remove a redundant distcheck job
...
Part of 33194.
2020-02-13 13:45:18 +10:00
03650e0f60
Travis: Require the macOS IPv6 chutney job
...
The job was previously set to fast_finish / allow_failure, to
speed up the build.
Closes ticket 33195.
2020-02-13 13:43:59 +10:00
5c68a74ed9
Merge branch 'maint-0.4.1' into release-0.4.1
2020-02-12 12:22:01 +10:00
5298113da9
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-02-12 12:21:57 +10:00
b9c7c61ea5
Lowercase the BridgeDistribution value from torrc in descriptors.
...
This patch ensures that we always lowercase the BridgeDistribution from
torrc in descriptors before submitting it.
See: https://bugs.torproject.org/32753
2020-02-12 12:21:41 +10:00
88723ad169
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
2020-02-12 12:18:59 +10:00
f9e73a923e
Merge branch 'maint-0.4.1' into release-0.4.1
2020-02-11 08:53:41 -05:00
Nick Mathewson
George Kadianakis
teor
Alexander Færøy