aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-15Merge branch 'maint-0.3.5' into maint-0.4.1maint-0.4.1Nick Mathewson
2020-05-15Fix use of non-portable == in configure.ac.Nick Mathewson
Fixes bug 34233. (This has bug has been backported to 0.3.5, but only released in 0.4.3, so it only needs a changes file there.)
2020-05-14Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-05-14Travis: temporarily fix stem version to d1174a83c2dcb7b8Nick Mathewson
This is a workaround for https://github.com/torproject/stem/issues/63
2020-05-06btrack_orconn_cevent.c: Add a missing "break;"Nick Mathewson
2020-05-06Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-05-06changes file for bug 34078.Nick Mathewson
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
GCC added an implicit-fallthrough warning a while back, where it would complain if you had a nontrivial "case:" block that didn't end with break, return, or something like that. Clang recently added the same thing. GCC, however, would let you annotate a fall-through as intended by any of various magic "/* fall through */" comments. Clang, however, only seems to like "__attribute__((fallthrough))". Fortunately, GCC accepts that too. A previous commit in this branch defined a FALLTHROUGH macro to do the right thing if GNUC is defined; here we replace all of our "fall through" comments with uses of that macro. This is an automated commit, made with the following perl one-liner: #!/usr/bin/perl -i -p s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i; (In order to avoid conflicts, I'm applying this script separately to each maint branch. This is the 0.4.1 version.)
2020-05-06Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
2020-05-06Use __attribute__((fallthrough)) rather than magic GCC comments.Nick Mathewson
GCC added an implicit-fallthrough warning a while back, where it would complain if you had a nontrivial "case:" block that didn't end with break, return, or something like that. Clang recently added the same thing. GCC, however, would let you annotate a fall-through as intended by any of various magic "/* fall through */" comments. Clang, however, only seems to like "__attribute__((fallthrough))". Fortunately, GCC accepts that too. A previous commit in this branch defined a FALLTHROUGH macro to do the right thing if GNUC is defined; here we replace all of our "fall through" comments with uses of that macro. This is an automated commit, made with the following perl one-liner: #!/usr/bin/perl -i -p s#/\* *falls? ?thr.*?\*/#FALLTHROUGH;#i;
2020-05-06Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-05-06Merge branch 'bug34078_prelim_041' into maint-0.4.1Nick Mathewson
2020-05-06Merge branch 'bug34078_prelim_035' into maint-0.3.5Nick Mathewson
2020-05-06Merge branch 'bug34078_prelim_035' into bug34078_prelim_041Nick Mathewson
2020-05-06Remove an incorrect "Fall through" comment.Nick Mathewson
2020-05-06address.c: add a single (harmless) missing break;Nick Mathewson
2020-05-06include compat_compiler for ed25519_donnaNick Mathewson
2020-05-06Replace some "fall through" comments not at the end of a case.Nick Mathewson
2020-05-06Replace a "fall through" comment that was outside a switch.Nick Mathewson
2020-05-06Add a fallthrough macro.Nick Mathewson
This macro defers to __attribute__((fallthrough)) on GCC (and clang). Previously we had been using GCC's magic /* fallthrough */ comments, but clang very sensibly doesn't accept those. Since not all compiler recognize it, we only define it when our configure script detects that it works. Part of a fix for 34078.
2020-05-04Merge branch 'bug34077_041' into maint-0.4.1Nick Mathewson
2020-04-30Fix a GCC 10.0.1 compilation warning.Nick Mathewson
Fixes 34077 for 0.4.1; bugfix on 0.4.0.3-alpha. (Specifically, GCC first gives this warning for 9eeff921ae7b786d960ea4286d5bba56)
2020-04-09Merge branch 'maint-0.3.5' into maint-0.4.1teor
2020-04-09Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5teor
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-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.3.5' into maint-0.4.1Nick Mathewson
"ours" to avoid version bump.
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.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.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 'trove_2020_004_041_v2' into maint-0.4.1Nick 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.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!)
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion