summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | hscrypto: Expose hs_mac as a SimpleMac.Nick Mathewson2023-08-144-1/+19
| | |
| * | llcrypto: New SimpleMac traitNick Mathewson2023-08-143-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will be useful in preference to the regular Mac trait for the places where we need to pass a Mac key around, but we don't need to support incremental operation. Part of arti#993, where we want to expose a MAC object without exposing sensitive data.
| * | Wrap a long line in hscrypto/Cargo.toml.Nick Mathewson2023-08-141-1/+8
|/ /
* | Merge branch 'readme_timeline' into 'main'Nick Mathewson2023-08-131-2/+6
|\ \ | |/ |/| | | | | README: Note more details about upcoming milestones See merge request tpo/core/arti!1471
| * README: Note more details about upcoming milestonesNick Mathewson2023-08-041-2/+6
| |
* | Merge branch 'nogit' into 'main'gabi-2502023-08-091-1/+1
|\ \ | | | | | | | | | | | | CI: Remove unneeded install of git in maint-checks See merge request tpo/core/arti!1492
| * | CI: Remove unneeded install of git in maint-checksIan Jackson2023-08-091-1/+1
|/ / | | | | | | | | | | | | This was added in 9357a8fd6b22 "ci: add shebang to the GitLab CI" as part of !990 to the `maint-checks` job; but the actual additional check was added to the `doc-features` job (by mistake, fixed in !1490); and, that shebang check script doesn't need git anyway.
* | Merge branch 'shebang-ci' into 'main'Ian Jackson2023-08-091-1/+1
|\ \ | | | | | | | | | | | | ci: move shebang check into proper CI test See merge request tpo/core/arti!1490
| * | ci: move shebang check into proper CI testEmil Engler2023-08-091-1/+1
|/ / | | | | | | | | | | | | Currently, the shebang check CI is not executed, as it would need to fail then. See !1489
* | Merge branch 'relative-shebang-nodep' into 'main'gabi-2502023-08-091-1/+1
|\ \ | | | | | | | | | | | | maint: use relative shebang in `maint/bump_nodep` See merge request tpo/core/arti!1489
| * | maint: use relative shebang in `maint/bump_nodep`Emil Engler2023-08-091-1/+1
| | |
* | | Merge branch 'chutney' into 'main'Ian Jackson2023-08-091-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disable chutney test again Closes #810 See merge request tpo/core/arti!1488
| * | | Disable chutney test againIan Jackson2023-08-091-0/+3
| | | |
* | | | Merge branch 'tor-proto-incoming-discard' into 'main'Ian Jackson2023-08-092-21/+61
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | tor-proto: Implement IncomingStream::discard() See merge request tpo/core/arti!1484
| * | | tor-proto: Make update_state() and discard() return Result<(), Bug>.Gabriela Moldovan2023-08-092-6/+6
| | | | | | | | | | | | | | | | These functions only ever return `Bug` errors.
| * | | tor-proto: Implement IncomingStream::discard().Gabriela Moldovan2023-08-082-2/+4
| | | |
| * | | tor-proto: Replace boolean flags with an IncomingStreamState enum.Gabriela Moldovan2023-08-081-18/+56
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces an `IncomingStreamState` enum, which indicates whether the stream was accepted, discarded, or rejected, or if it is still pending. The `is_rejected`/`is_accepted` boolean flags are no longer needed. Without this change, we'd need to introduce yet another boolean flag when we implement `discard()` (for the "discarded" state).
* | | Merge branch 'key-uses' into 'main'Ian Jackson2023-08-091-0/+144
|\ \ \ | | | | | | | | | | | | | | | | key-management.md: Use scenarios See merge request tpo/core/arti!1445
| * | | key-management.md: Fix typosgabi-2502023-08-081-3/+3
| | | |
| * | | key-management.md: Use scenariosIan Jackson2023-07-281-0/+143
| | | |
| * | | key-management.md: Fix pandoc formattingIan Jackson2023-07-281-0/+1
| | | | | | | | | | | | | | | | Add a missing blank line.
* | | | Merge branch 'remove-keystore-fs-perm-variant' into 'main'Ian Jackson2023-08-092-13/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-error: Remove KeystoreFsPermissions variant. See merge request tpo/core/arti!1487
| * | | | tor-error: Remove KeystoreFsPermissions variant.Gabriela Moldovan2023-08-082-13/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | According to the `ErrorKind` lumping guidelines, `KeystoreFsPermissions` should be lumped with `FsPermissions`: they represent the same type of error, and their "location" is the same ("Host"). Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1315#note_2916455
* | | | Merge branch 'with_coverage-no-list' into 'main'Ian Jackson2023-08-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | maint: provide no list of grcov formats See merge request tpo/core/arti!1482
| * | | | maint: provide no list of grcov formatsEmil Engler2023-08-081-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes a list we provide for the supported grcov formats. In my opinion, this is a practice of bad software engineering, as we would then have to maintain this list by ourselves. Therefore, this commit removes this list from the `maint/with_coverage` script and replaces it with a references to the accompanying grcov command.
* | | | Merge branch 'bridge-disabled' into 'main'Ian Jackson2023-08-081-3/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arti-client config: Fix bridge handling and test it Closes #1000 See merge request tpo/core/arti!1481
| * | | | bridge config: Fix an error message slightlyIan Jackson2023-08-081-1/+1
| | | | |
| * | | | arti-client config test: partially un-degrade formattingIan Jackson2023-08-081-10/+10
| | | | |
| * | | | arti-client config test: degrade formattingIan Jackson2023-08-081-12/+18
| | | | | | | | | | | | | | | | | | | | As demanded by rustfmt
| * | | | arti-client config: Add an extra test case for bridgesIan Jackson2023-08-081-0/+45
| | | | | | | | | | | | | | | | | | | | This complements the new `check_bridge_pt` test.
| * | | | bridge config: reject bridges=true when there are no bridgesIan Jackson2023-08-081-2/+0
| |/ / / | | | | | | | | | | | | This is a bugfix. Perhaps it is a security fix?
* | | | Merge branch 'coverage-fixes' into 'main'gabi-2502023-08-081-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | maint: list the HTML dependencies in coverage See merge request tpo/core/arti!1485
| * | | maint: remove useless optargEmil Engler2023-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | The `maint/coverage` script has a useless option `c`. This commit removes it.
| * | | maint: list the HTML dependencies in coverageEmil Engler2023-08-081-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Currently, the `maint/coverage` script does not inform about the dependencies required for generating the HTML output, those are, the Python packages `bs4` and `lxml`. This commit fixes that, by updating the help section accordingly.
* | | Merge branch 'tor-proto-incoming-todo' into 'main'gabi-2502023-08-081-18/+15
|\ \ \ | | | | | | | | | | | | | | | | tor-proto: Replace IncomingStreamMsg with IncomingStreamRequest. See merge request tpo/core/arti!1477
| * | | tor-proto: Replace IncomingStreamMsg with IncomingStreamRequest.Gabriela Moldovan2023-08-071-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two enums essentially serve the same purpose, so we don't need both of them. This also addresses the TODO that says we should return an error if `accept_data` is called for a RESOLVE stream.
* | | | Merge branch 'tor-proto-incoming-drop' into 'main'Ian Jackson2023-08-082-15/+77
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-proto: Implement `Drop` for `IncomingStream`. See merge request tpo/core/arti!1476
| * | | | tor-proto: Fix broken docs.Gabriela Moldovan2023-08-081-1/+1
| | | | |
| * | | | tor-proto: Make it obvious that we're discarding a Result.Gabriela Moldovan2023-08-081-1/+1
| | | | |
| * | | | tor-proto: Make StreamTarget::close return the oneshot::Receiver instead of ↵Gabriela Moldovan2023-08-082-33/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blocking. Instead of having 2 version of `StreamTarget::close` (a blocking one and a nonblocking one), we can just return the `oneshot::Receiver` for receiving the reactor's response and let the caller of `StreamTarget::close` decide whether to block. This allows us to reduce some code duplication in the `IncomingStream` implementation.
| * | | | tor-proto: Make take_inner() use mut_inner() to check the inner value.Gabriela Moldovan2023-08-081-3/+6
| |/ / /
| * | | tor-proto: Implement `Drop` for `IncomingStream`.Gabriela Moldovan2023-08-071-11/+64
| | | |
| * | | tor-proto: Keep track of whether the `IncomingStream` was accepted.Gabriela Moldovan2023-08-071-0/+5
| | | | | | | | | | | | | | | | | | | | The behaviour of `IncomingStream::drop` is going to depend on whether the stream was accepted or not.
| * | | tor-proto: Add a function for closing a stream without waiting for the ↵Gabriela Moldovan2023-08-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reactor to respond. This will be used for implementing `Drop` for `IncomingStream` (it needs to "reject" the stream on drop).
* | | | Merge branch 'error' into 'main'gabi-2502023-08-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-config: Expand NoProjectDirs error message See merge request tpo/core/arti!1480
| * | | | tor-config: Expand NoProjectDirs error messageIan Jackson2023-08-081-1/+1
|/ / / /
* | | | Merge branch 'error2' into 'main'gabi-2502023-08-075-10/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow operation when default config files cannot be determined See merge request tpo/core/arti!1479
| * | | | arti: Use ConfigurationSources::try_from_cmdlineIan Jackson2023-08-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to proceed if * the default config file locations can't be established (eg due to failure of the `directories` crate), but * configuration files are explicitly specified, so the defaults wouldn't be used
| * | | | tor-config: Add ConfigurationSources::try_from_cmdlineIan Jackson2023-08-074-7/+37
| | | | | | | | | | | | | | | | | | | | We'll use this in crates/arti in a moment.
* | | | | Merge branch 'error' into 'main'gabi-2502023-08-071-1/+1
|\| | | | | |/ / / |/| | | | | | | | | | | arti: Add context to default config files error message See merge request tpo/core/arti!1478