nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 23:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,455 Commits 53 Branches 630 Tags 125 MiB
cbcc570ff4
Commit Graph

29455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f68aab83ba Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-21 19:20:31 -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
21a9d03445 fixup! Check for duplicate-close in connection_dir_finished_flusing() 2018-08-21 11:15:07 -04:00
Nick Mathewson
ff0be08059 Fix a bug warning when sending an error on an HTTPTunnelPort conn 
Fixes bug 26470; bugfix on 0.3.2.1-alpha.
 2018-08-21 10:12:04 -04:00
Nick Mathewson
df874ed0f1 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-21 10:01:41 -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
18183de060 Check for duplicate-close in connection_dir_finished_flusing() 
Fix for 26896.
 2018-08-21 09:50:48 -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
cypherpunks
fecd583c0e rust: abort on panic in all profiles 
Until https://github.com/rust-lang/rust/issues/52652 is fixed,
unwinding on panic is potentially unsound in a mixed C/Rust codebase.

The codebase is supposed to be panic-free already, but just to be safe.

This started mattering at commit d1820c1516.

Fixes #27199; bugfix on tor-0.3.3.1-alpha.
 2018-08-18 19:23:28 +00:00
Nick Mathewson
700f5bcc43 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-17 09:38:26 -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
Nick Mathewson
ac721bd3b4 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-17 09:29:46 -04: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
Nick Mathewson
b49355915b Merge branch 'maint-0.3.3' into maint-0.3.4 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
2deee972a3 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-16 08:35:31 -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
571cb2f662 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-15 12:20:57 -04: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
6c1d2549df Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-15 02:16:23 -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
c28da0d8e1
Merge branch 'travis-osx-033' into travis-osx-034 2018-08-10 19:06:45 +10: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
a1c110a2a4
Merge branch 'travis-osx-033' into travis-osx-034 
Take the asciidoc changes from 033, and the module changes from
034.
 2018-08-10 16:41:27 +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
2a33edc595
Travis: Check disable module dirauth with and without rust 
Part of 24629, also fixes 27088.
 2018-08-10 13:23:58 +10:00
teor
6e0be81211
Merge branch 'travis-osx-033' into travis-osx-034 
Replace 034 .travis.yml with 033 .travis.yml.
Subsequent commits will restore 034 functionality.

Replace 034 src/test/test_rust.sh with 033
src/test/test_rust.sh, which was backported from
master.
 2018-08-10 13:15:16 +10:00
teor
e1291aa84a
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 13:11:27 +10:00
teor
a5715a46c4
Changes file for Travis: enable macOS builds 2018-08-10 12:44:31 +10:00
teor
7ec75e014f
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 12:44:20 +10:00
teor
82cccfbe25
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 12:42:18 +10:00
teor
f398da2e2d
Travis: put distcheck first for readability 2018-08-10 12:41:58 +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