teor
ae2085dd7b
Merge branch 'ticket27252-032' into ticket27252-033
...
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
- TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
2018-08-23 18:19:42 +10:00
teor
92f1a8af83
Travis: Skip offline rust builds for Linux gcc
...
We already do an online rust build for Linux gcc.
Part of 27252.
2018-08-23 18:18:14 +10:00
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
8691046ac6
Merge branch 'maint-0.3.2' into maint-0.3.3
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
3cfceeb45d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 20:04:17 -04:00
Nick Mathewson
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
2018-08-21 20:03:56 -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
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 19:16:40 -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
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
2018-08-21 10:01:38 -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
Nick Mathewson
87aacbfbba
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
2018-08-17 09:38:08 -04:00
cypherpunks
7b7dd9ae1c
rust/protover: don't accept whitespace in ProtoSet::from_str()
...
It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.
And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.
These were added in 9925d2e687
.
Fixes #27177 . Bugfix on 0.3.3.5-rc.
2018-08-17 13:34:03 +00:00
cypherpunks
cc93f175ed
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()
...
It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.
Introduced in d1820c1516
.
Fixes #27164 ; bugfix on 0.3.3.1-alpha.
2018-08-17 13:27:24 +00:00
Nick Mathewson
936e2aa0de
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:37:11 -04:00
George Kadianakis
c798957b59
Keep descriptor rotation time after HUP occurs.
2018-08-16 08:36:48 -04:00
Nick Mathewson
4847e22168
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:35:27 -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
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04: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
Nick Mathewson
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
teor
6463cdea55
Merge branch 'travis-osx-032' into travis-osx-033
2018-08-10 19:06:32 +10: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
ed1210d0f1
Merge branch 'travis-osx-032' into travis-osx-033
...
Preserve 033 changes since 032.
2018-08-10 16:38:13 +10:00
teor
546c134801
Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
...
Re-applies 0.3.3 changes after 24629.
2018-08-10 16:37:19 +10:00
teor
f5aa667d48
Travis: Check Rust with distcheck in 0.3.3 and later
...
Backports an 0.3.4 change that also works in 0.3.3.
Part of 24629.
2018-08-10 16:37:06 +10:00
teor
a544af8186
Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
...
TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2.
Re-applies 0.3.3 changes after 24629.
2018-08-10 16:34:04 +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
229a75a49a
Rust: use a consistent working directory in builds and tests
...
cd to ${abs_top_builddir}/src/rust before running cargo in
src/test/test_rust.sh.
Fixes bug 26497; bugfix on 0.3.3.2-alpha.
2018-08-10 11:54:26 +10:00
teor
0f3fd10ee0
Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
...
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:47:36 +10:00
teor
2b9dd0f9c0
Merge branch 'travis-osx-032' into travis-osx-033
...
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.
src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.
Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
2018-08-10 11:43:17 +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