aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-21Add changes file for 26873. I missed this when merging earlier.Nick 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-20Fix typo in comment for getinfo_helper_current_time()Neel Chauhan
2018-08-17Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-17Merge branch 'maint-0.3.4'Nick Mathewson
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-17Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-17Merge branch 'maint-0.3.4'Nick Mathewson
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-17Merge remote-tracking branch 'onionk/rust-docs1'Nick Mathewson
2018-08-17In addrs_in_same_network_family(), choose IP subnet size based on IP typeNeel Chauhan
2018-08-17rust/protover: fix docs for UnvalidatedProtoEntry::from_strcypherpunks
This got shuffled around in b786b146edd33b025774819f54d7bba3d07bf832 and hasn't been accurate since 124caf28e6db1e7bf8cdfef25c55760c81fb91b5.
2018-08-17rust/protover: fix parsing docscypherpunks
The function takes an already validated utf-8 string, and it never checks if the version numbers are an empty string. That parse error happens later. Fix on 701c2b69f52cb4db46aa7455904e518b35fafc1a
2018-08-17rust/protover: fix ProtoEntry::from_str docscypherpunks
Texxt was copied from a function that returned a single tuple in 88b2f170e451567a3b0095a420544a675a5826b0.
2018-08-16Merge branch 'pr275_squashed'Nick Mathewson
2018-08-16rust: run rustfmtcypherpunks
2018-08-16add make check-rustfmtcypherpunks
2018-08-16rust: max_width=100, other rustfmt settings. #27071cypherpunks
These are the 12 stable and documented configuration options, set to their default values. use_small_heuristics is only stabilized in rustfmt 0.9, so maintain support for 0.8.x for now by commenting it out. comment_width is unstable and did nothing, since wrap_comments defaults to false. Default values gotten from `rustfmt --print-config default rustfmt.toml`. https://github.com/rust-lang-nursery/rustfmt/blob/e7932fa9c2591c45a37a24305de90cb63128afcf/Configurations.md
2018-08-16rust/docs: fix critical typo for missing_docs lintcypherpunks
Fix typo from fe66d06a45a4714141eba992fe87ec3dd5fa1c22. The exclamation point is what lets an attribute apply to an entire crate, without the ! it's practically a placebo. Fix on commits af182d4ab51d6a1a70559bbdcd4ab842aa855684 and b6059297d7cb76f0e00e2098e38d6677d3033340, and note there are still missing docs in both crypto and protover, for now. https://doc.rust-lang.org/reference/attributes.html
2018-08-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-16Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-16Merge branch 'maint-0.3.4'Nick Mathewson
2018-08-16Keep descriptor rotation time after HUP occurs.George Kadianakis
2018-08-16Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-16Merge branch 'maint-0.3.4'Nick Mathewson
2018-08-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-16Merge branch 'ticket27096'Nick Mathewson
2018-08-16Exclude setenv/unsetenv code on Windowsrl1987
2018-08-16Fix test to pass without HOME env being setrl1987
2018-08-16Rust: Say that we support rust stable in GettingStartedRust.mdteor
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-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-15Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-15Merge branch 'maint-0.3.4'Nick Mathewson
2018-08-15Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-15Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9Nick Mathewson
2018-08-15Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-08-15Merge branch 'maint-0.3.4'Nick Mathewson
2018-08-15Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3Nick Mathewson
2018-08-15Merge remote-tracking branch 'public/bug26779_035'Nick Mathewson
2018-08-11Merge remote-tracking branch 'tor-github/pr/206'Nick Mathewson
2018-08-11Merge remote-tracking branch 'tor-github/pr/244'Nick Mathewson
2018-08-11Merge remote-tracking branch 'tor-github/pr/268'Nick Mathewson
2018-08-10Merge remote-tracking branch 'tor-github/pr/239'Nick Mathewson
2018-08-10Merge branch 'travis-osx-034' into travis-osx-masterteor
2018-08-10Merge branch 'travis-osx-033' into travis-osx-034teor
2018-08-10Merge branch 'travis-osx-032' into travis-osx-033teor
2018-08-10Merge branch 'travis-osx-029' into travis-osx-032teor
Merge asciidoc from 029 with rust from 032.
2018-08-10Travis: add a missing macOS asciidoc env varteor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion