summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-25Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-20Merge branch 'bug33673_035' into bug33673_041teor
Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.
2020-03-20Appveyor: Copy required DLLs to test and appteor
Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha.
2020-03-20Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-03-19Merge branch 'ticket33643_skip_035' into ticket33643_skip_041Nick Mathewson
2020-03-19Appveyor: disable crypto/openssl_versionNick Mathewson
2020-03-19Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.Nick Mathewson
For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run the tests and suppress all the "crypto/" tests. You could get the same effect by running "./src/test/test :crypto/..", but that can be harder to arrange from CI. Part of a fix/workaround for 33643.
2020-03-18Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" to avoid version bump.
2020-03-18Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
"ours" to avoid version bump.
2020-03-18Bump version to 0.4.2.7-devNick Mathewson
2020-03-18Bump version to 0.4.1.9-devNick Mathewson
2020-03-18Bump version to 0.3.5.10-devNick Mathewson
2020-03-18Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-18Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-18Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.Nick Mathewson
2020-03-17Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-17Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-17Merge branch 'trove_2020_002_041' into maint-0.4.1Nick Mathewson
2020-03-17Merge branch 'trove_2020_002_035' into maint-0.3.5Nick Mathewson
2020-03-17Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-17Merge branch 'trove_2020_004_041_v2' into maint-0.4.1Nick Mathewson
2020-03-17Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-17Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-17Fix TROVE-2020-003.George Kadianakis
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-17Trivial bugfixes found during TROVE investigation.George Kadianakis
2020-03-17Merge branch 'trove_2020_002_035' into trove_2020_002_041Nick Mathewson
2020-03-17Use >= consistently with max_bits.Nick Mathewson
2020-03-17Add off-by-one checks for key length.Nick Mathewson
2020-03-17Extract key length check into a new function, and check more fields.Nick Mathewson
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-16circpad_setup_machine_on_circ(): exit early on error.Nick Mathewson
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-16Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-03-16Merge branch 'maint-0.3.5' into maint-0.4.1teor
2020-03-16Travis: Produce detailed chutney diagnosticsteor
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool to produce detailed diagnostic output. Closes ticket 32792.
2020-03-14Merge branch 'trove_2020_002_035' into trove_2020_002_041Nick Mathewson
2020-03-14Fix memory leak in crypto_pk_asn1_decode_private.Nick Mathewson
(Deep, deep thanks to Taylor for reminding me to test this!)
2020-03-14Add a test for crypto_pk_asn1_decode_private maxbits.Nick Mathewson
2020-03-14Revise TROVE-2020-002 fix to work on older OpenSSL versions.Nick Mathewson
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-13Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" to avoid version bump.
2020-03-13Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
"ours" to avoid version bump.
2020-03-13Bump to 0.3.5.10Nick Mathewson
2020-03-13Bump to 0.4.1.9Nick Mathewson
2020-03-13Bump to 0.4.2.7.Nick Mathewson
2020-03-13Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-13Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-13Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5Nick Mathewson
2020-03-13Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2Nick Mathewson
2020-02-13Merge branch 'bug33195_041' into bug33195_042teor
Conflicts: * Keep RUST_VERSION from maint-0.4.2 * Keep the commented-out allow_failure entries from bug33195_041
2020-02-13Merge branch 'bug33195_035' into bug33195_041teor
Conflicts: * Keep TOR_TEST_RNG_SEED from maint-0.4.1 * Keep the ordering from bug33195_035
2020-02-13Travis: Sort jobs in order of speedteor
Putting the slowest jobs first takes full advantage of Travis concurrency. Closes 33194.
2020-02-13Travis: Remove a redundant distcheck jobteor
Part of 33194.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion