Commit Graph

27231 Commits

Author SHA1 Message Date
teor b61d40c8a2 Travis: Only run one online rust build, to reduce network errors
Part of 27252.
2018-08-23 18:17:03 +10:00
teor 99a2ecc795 Merge branch 'ticket27252-029' into ticket27252-032
This commit is already implemented in 0.3.2 and later:
- Travis: Skip a duplicate hardening-off build in Tor 0.2.9
2018-08-23 18:15:55 +10:00
teor 7cea5a287f Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux.

Part of 27252.
2018-08-23 18:13:53 +10:00
teor 9f81e03262 Travis: make the exclude descriptions shorter
Part of 27252.
2018-08-23 18:12:36 +10:00
teor 7ec84cc094 Travis: Skip a duplicate hardening-off build in Tor 0.2.9
Part of 27252.
2018-08-23 17:08:28 +10:00
teor 8f89fb8f39 Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
2018-08-23 17:02:32 +10:00
Nick Mathewson c1ad40627b Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-22 09:37:31 -04:00
Nick Mathewson 9068e2fa28 Mark cert_matches_key as not-intrusive; fix stretch compilation. 2018-08-22 09:37:26 -04:00
Nick Mathewson a5bbe3f1d0 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-21 20:03:46 -04:00
Nick Mathewson a29e9a901d Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 2018-08-21 20:03:41 -04:00
Nick Mathewson 05d62a3b73 Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9 2018-08-21 20:03:19 -04:00
Nick Mathewson d52f406001 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-21 19:16:40 -04:00
Nick Mathewson 85a8792344 Rewrite test_tortls_cert_matches_key()
Unlike the old test, this test no will no longer mess around with
the forbidden internals of any openssl data structures.

Additionally, it verifies several other behaviors of
tor_tls_cert_matches_key() that we had wanted to verify, such as
the possibility of the certificate's key not matching.

Fixes bug 27226; bugfix on 0.2.5.1-alpha.
2018-08-20 17:43:41 -04:00
Nick Mathewson c1f476a3d5 Use our x509 wrapper code in tor_tls_cert_matches_key()
This allows us to mock our own tor_tls_get_peer_certificate()
function in order to test ..cert_matches_key(), which will in turn
allow us to simplify test_tortls_cert_matches_key() considerably.

Prep work for the fix for 27226.
2018-08-20 17:42:38 -04:00
George Kadianakis c798957b59 Keep descriptor rotation time after HUP occurs. 2018-08-16 08:36:48 -04:00
teor db3414dd51 Rust: Say that we support rust stable in GettingStartedRust.md
In 24765, we said that we supported rust stable in CodingStandardsRust.md.
But we left GettingStartedRust.md saying that we support rust nightly.

Closes 27160.
2018-08-16 18:58:47 +10:00
Nick Mathewson a26a2735b9 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-15 12:20:57 -04:00
Nick Mathewson 4c355ff185 Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9 2018-08-15 12:20:53 -04:00
teor e2eec40c44 Merge branch 'travis-osx-029' into travis-osx-032
Merge asciidoc from 029 with rust from 032.
2018-08-10 19:06:01 +10:00
teor d514e98663 Travis: add a missing macOS asciidoc env var 2018-08-10 18:26:33 +10:00
teor 69adc68ac6 Merge branch 'travis-osx-029' into travis-osx-032
Simple merge to resolve order conflicts.
2018-08-10 16:31:35 +10:00
teor 169afe3ca5 Travis: Improve Rust comments 2018-08-10 16:30:21 +10:00
teor e78f9c5dfb Travis: add a missing macOS asciidoc dependency 2018-08-10 16:24:31 +10:00
teor f4f2e43f5d Travis: put distcheck first for readability 2018-08-10 12:33:51 +10:00
teor 4cd3fcf248 Changes file for Travis: enable macOS builds 2018-08-10 12:10:56 +10:00
teor 4517c4c3e3 Changes file for Rust: backport src/test/test_rust.sh from master 2018-08-10 11:26:53 +10:00
teor 3b1c74baa5 Travis: Use cargo cache
Closes ticket 26952.
2018-08-10 11:23:26 +10:00
teor c9ad16ca2a Fix $abs_top_srcdir in test_rust.sh
Consistently use ../../.. as a fallback for $abs_top_srcdir in
test_rust.sh.

Fixes bug 27093; bugfix on 0.3.4.3-alpha.
2018-08-10 11:22:36 +10:00
teor ce19477ffc Stop setting $CARGO_HOME
cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.

Fixes bug 26497; bugfix on 0.3.1.5-alpha.
2018-08-10 11:14:32 +10:00
teor 2a35b085ee Rust: backport src/test/test_rust.sh from master
Preparation for 26497.
2018-08-10 11:09:18 +10:00
teor f76cddd376 Travis: fix a typo 2018-08-10 10:50:35 +10:00
teor aee51d9a0e Travis: fix a typo 2018-08-09 23:44:27 +10:00
teor e387eee362 Travis: add rust cargo offline mode
Backports parts of the 0.3.3 travis config.

Part of 24629.
2018-08-09 23:42:26 +10:00
teor 14ceee0fd1 Travis: add rust cargo online mode
Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9
merge.

Also:
* build rust on clang and gcc, Linux and macOS
* build combinations of non-default options on gcc Linux
* exclude broken builds
* log the rustup version

Part of 24629.
2018-08-09 23:40:24 +10:00
Nick Mathewson 8982719f6a Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-09 08:47:24 -04:00
teor e4d7f2667c Travis: add lzma and zstd, where available
Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9
merge.

Part of 24629, also fixes 27090.
2018-08-09 22:22:27 +10:00
teor 38cf52b023 Merge branch 'travis-osx-029' into travis-osx-032
Replace 032 .travis.yml with 029 .travis.yml.
Subsequent commits will restore 032 functionality.
2018-08-09 22:20:29 +10:00
teor fa9a0cc1fe Travis: list installed package versions before building
Part of 24629.
2018-08-09 22:19:03 +10:00
teor 23b242104b Travis: run an asciidoc build
Implements 27087.
2018-08-09 22:19:00 +10:00
teor 286a6bc3b8 Travis: Use ccache
Part of ticket 26952.
2018-08-09 22:18:53 +10:00
teor 74b3a340df Travis: make macOS builds work for Tor 0.2.9
Tor 0.2.9 needs extra help to find OpenSSL on macOS.

Part of 24629.
2018-08-09 22:18:44 +10:00
teor 7cf7b52fca Travis: create configure flags once, then echo the flags
Creating the configure flags once avoids inconsistent flags
between configure and distcheck configure.

Echoing the flags helps developers work out what configure is
doing.

(Backported to 0.2.9 and later as a precaution.)

Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.
2018-08-09 22:18:12 +10:00
teor 515d190b2c Travis: enable macOS builds
Also:
* explain why we don't install zlib

Part of 24629.
2018-08-09 22:17:50 +10:00
teor c53f17fb1a Travis: Rewrite .travis.yml
Build on all compilers:
* default options + hardening

Build on gcc:
* coverage (+ no hardening)
* distcheck
* no hardening

Add some extra logging:
* tail config.log on failure
  (config.log is too long for travis to render)

Put the config in a more logical order
* Sort config items in chronological order
* Put related items together

Part of 24629.
2018-08-09 18:33:41 +10:00
Karsten Loesing fe19b40fe9 Update geoip and geoip6 to the August 7 2018 database. 2018-08-09 09:44:38 +02:00
Taylor Yu 340da669be Add more optional packages to Travis
Apparently we weren't building with either libcap or libseccomp on
Travis.  Install libcap-dev and libseccomp-dev in .travis.yml.  Closes
ticket 26560.
2018-08-09 16:51:42 +10:00
Nick Mathewson 7a570b8182 Don't search for -lpthread on Windows
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present.  Fixes bug 27081; bugfix on 1790dc6760 in 0.1.0.1-rc.
2018-08-08 09:56:51 -04:00
Nick Mathewson 8e68fe7e1c Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-08 09:26:22 -04:00
Nick Mathewson 27a2a6cb9b Changes file for 25440 2018-08-08 09:26:21 -04:00
Daniel Pinto a350f216b3 Fix crash when calling openat with sandbox enabled #25440
The seccomp rule for the openat syscall checks for the AT_FDCWD
constant. Because this constant is usually a negative value, a
cast to unsigned int is necessary to make sure it does not get
converted to uint64_t used by seccomp.

More info on:
https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980
2018-08-08 09:21:29 -04:00