summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-09-07Bump to 0.3.3.10Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Tell openssl to build its TLS contexts with security level 1Nick Mathewson
Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024.
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Merge branch 'bug27461-029' into bug27461-032teor
Fix a minor merge conflict due to an #endif comment.
2018-09-07Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windowsteor
It is not supported, and always fails. Some compilers warn about the function pointer cast on 64-bit Windows. Fixes bug 27461; bugfix on 0.2.2.23-alpha.
2018-09-07hs: Silence a spurious warning in rend_client_send_introduction()teor
gcc 8 warns that extend_info_t.nickname might be truncated by strncpy(). But it doesn't know that nickname can either contain a hex id, or a nicknames. hex ids are only used for general and HSDir circuits. Fixes bug 27463; bugfix on 0.1.1.2-alpha.
2018-09-07Windows: Silence a spurious warning in the GetAdaptersAddresses castteor
GetProcAddress() returns FARPROC, which is (long long int(*)()) on 64-bit Windows: https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit and 64-bit Windows: https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses So gcc 8 issues a spurious "incompatible function pointer" warning about the cast to GetAdaptersAddresses_fn_t. Silence this warning by casting to a void function pointer, before the cast to GetAdaptersAddresses_fn_t. This issue is already fixed by 26481 in 0.3.5 and later, by removing the lookup and cast. Fixes bug 27465; bugfix on 0.2.3.11-alpha.
2018-08-27Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-27When running make test-network-all, use the mixed+hs-v2 networkteor
No behaviour change. A previous fix to chutney removed v3 onion services from the mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is confusing. Fixes bug 27345; bugfix on 0.3.2.1-alpha.
2018-08-24Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-24Merge branch 'ticket27286_032_v2' into maint-0.3.2Nick Mathewson
2018-08-24Update the protocol versions recommendations to remove LinkAuth=1Nick Mathewson
LinkAuth method 1 is the one where we pull the TLS master secrets out of the OpenSSL data structures and authenticate them with RSA. Right now we list method 1 as required for clients and relays. That's a problem, since we can't reasonably support it with NSS. So let's remove it as a requirement and a recommendation. As for method 3: I'd like to recommend it it, but that would make 0.2.9 start warning. Let's not do that till at least some time after 0.3.5 (the next LTS) is stable. Closes ticket 27286
2018-08-23Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-23Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-24Silence a compilation warning on MSVC 2017 and clang-clteor
test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha.
2018-08-22Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-22Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-22Mark cert_matches_key as not-intrusive; fix stretch compilation.Nick Mathewson
2018-08-21Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3Nick Mathewson
2018-08-21Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2Nick Mathewson
2018-08-21Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-21Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-20Rewrite test_tortls_cert_matches_key()Nick Mathewson
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-20Use our x509 wrapper code in tor_tls_cert_matches_key()Nick Mathewson
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-17Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3Nick Mathewson
2018-08-17rust/protover: don't accept whitespace in ProtoSet::from_str()cypherpunks
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 9925d2e68709aa7346f4c5bc98ea1349df6741f3. Fixes #27177. Bugfix on 0.3.3.5-rc.
2018-08-17rust/protover: fix hyphen parsing bug in ProtoSet::from_str()cypherpunks
It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen and everything after. Introduced in d1820c1516a31a149fc51a9e5126bf899e4c4e08. Fixes #27164; bugfix on 0.3.3.1-alpha.
2018-08-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-16Keep descriptor rotation time after HUP occurs.George Kadianakis
2018-08-15Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3Nick Mathewson
2018-08-10Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4teor
Re-applies 0.3.3 changes after 24629.
2018-08-10Rust: use a consistent working directory in builds and teststeor
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-10Stop setting $CARGO_HOME in src/rust/tor_rust/include.amteor
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-10Merge branch 'travis-osx-032' into travis-osx-033teor
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-10Fix $abs_top_srcdir in test_rust.shteor
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-10Stop setting $CARGO_HOMEteor
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-10Rust: backport src/test/test_rust.sh from masterteor
Preparation for 26497.
2018-08-09Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-09Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-09Update geoip and geoip6 to the August 7 2018 database.Karsten Loesing
2018-08-08Merge branch 'bug26948_033' into maint-0.3.3Nick Mathewson