summaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
...
* | | tor-keymgr: Add sec1 0.7.3 dependency.Gabriela Moldovan2023-08-161-0/+10
| | |
* | | tor-keymgr: Re-export ssh-key.Gabriela Moldovan2023-08-164-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `KeypairData` type from [ssh-key] at some point leaked into the keymgr API (via the `EncodableKey` trait). Instead of re-exporting just `KeypairData`, let's re-export the entire `ssh_key` crate (`EncodableKey` implementors would need additional types from `ssh_key` to construct a `KeypairData` object anyway). [ssh-key]: https://crates.io/crates/ssh-key
* | | keymgr: Implement as_ssh_keypair_data for curve25519 keys.Gabriela Moldovan2023-08-161-4/+13
| | |
* | | keymgr: Import internal! (fmt).Gabriela Moldovan2023-08-161-4/+2
| | |
* | | keymgr: Import internal!.Gabriela Moldovan2023-08-161-3/+3
| | |
* | | keymgr: Remove unused helper.Gabriela Moldovan2023-08-161-33/+0
| | | | | | | | | | | | | | | This helper is no longer needed (the logic from `parse_ssh_format_erased` changed).
* | | tor-keymgr: Test x25519 key parsing.Gabriela Moldovan2023-08-163-0/+44
| | |
* | | keymgr: Do not expect x25519 keys to be stored as ed25519 ssh keys.Gabriela Moldovan2023-08-161-13/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the Arti key store would store x25519 secret keys as ed25519 OpenSSH keys, which it would convert to x25519 upon loading (using the conversion function added in !1297 (merged)). This approach isn't good enough though: most people will probably want to bring their existing x25519 keys, and in order to store those in OpenSSH format, we'd need convert them to ed25519, which is impossible (because the secret part of an x25519 key contains a SHA512'd secret, whereas the corresponding, "un-expanded", ed25519 secret key contains the secret itself rather than the SHA). Now that `ssh-key` has support for ssh keys with [custom algorithm names], we can store x25519 in OpenSSH format directly. This commit changes the storage format used by the keymgr for x25519 client auth keys (from ed25519-ssh to our own custom key type with an algorithm name of `"[email protected]"`). Closes #936 [custom algorithm names]: https://github.com/RustCrypto/SSH/pull/136
* | | keymgr: Bump ssh-key to 0.6.0.Gabriela Moldovan2023-08-162-2/+11
| | | | | | | | | | | | This brings in the changes from #936.
* | | tor-error, arti: Bump backtrace to 0.3.68.Gabriela Moldovan2023-08-152-2/+2
| |/ |/| | | | | | | | | | | | | Previously we were using backtrace 0.3.39, which has a [bug] that causes it to segault in some circumstances. I experienced this bug while trying to fix the minimal-versions build in !1508. [bug]: https://github.com/rust-lang/backtrace-rs/issues/267
* | Start working on the backend for an IptEstablisher.Nick Mathewson2023-08-142-8/+247
| | | | | | | | | | | | | | | | This should be enough now to establish real introduction points, though there is still a lot of work to do. Part of #976. This has been rebased and edited to incorporate discussions from !1465.
* | proto: Fix a type-complexity warning.Nick Mathewson2023-08-142-9/+21
| |
* | proto: API to expose the `CircuitBinding` type.Nick Mathewson2023-08-144-5/+40
| | | | | | | | Closes #993
* | proto: Take CircuitBinding one step forward into Reactor::add_hop.Nick Mathewson2023-08-144-10/+26
| |
* | proto: Add (not-yet-exposed) code to remember and use KH valuesNick Mathewson2023-08-145-16/+82
| | | | | | | | | | | | | | | | These values are computed as part of the circuit extension handshake, and are used as MAC keys to bind `ESTABLISH_INTRO` messages to a particular circuit so that they can't be replayed. Part of #993.
* | cell: make establish_intro accept impl<Into<HsMacKey>>Nick Mathewson2023-08-142-15/+15
| | | | | | | | | | | | | | | | | | | | | | This allows us to allow passing in opaque HsMacKey objects, rather than untyped byte slices. Additionally, we now check both MAC and signature unconditionally, to avoid the large timing side-channel. The small timing side-channel of combining booleans with `&` is considered safe. Part of #993.
* | hscrypto: Expose hs_mac as a SimpleMac.Nick Mathewson2023-08-143-1/+18
| |
* | 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 '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 '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
* | 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 '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).
* | tor-config: Expand NoProjectDirs error messageIan Jackson2023-08-081-1/+1
| |
* | 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-073-7/+36
| | | | | | | | We'll use this in crates/arti in a moment.
* | arti: Add context to default config files error messageIan Jackson2023-08-071-1/+1
|/ | | | | | | | | | | | Improves the error mesage in #989 somewhat. Before: target/debug/arti: error: Can't construct project directories to resolve a path element After: target/debug/arti: error: identify default config file locations: Can't construct project directories to resolve a path element
* tor-proto: Rename misleading field in `DataCmdChecker`.Gabriela Moldovan2023-08-071-13/+16
| | | | | | | | This is a follow-up from !1451. This commit solves a `TODO HSS` introduced when `DataCmdChecker` got an additional constructor (`new_connected`) for creating "pre-connected" streams. See f6745d31 for more details.
* Merge branch 'proto-flaky-test' into 'main'gabi-2502023-08-043-14/+29
|\ | | | | | | | | | | | | tor-proto: allow_stream_requests now waits until the control message is received. Closes #994 See merge request tpo/core/arti!1474
| * tor-proto: Shut down the reactor if an error occurs in incoming stream ↵Gabriela Moldovan2023-08-041-4/+4
| | | | | | | | | | | | | | | | init/close. Propagating the error means will cause the reactor to shut down (there's not much the control message sender can do about it, so there's no point in sending it the error).
| * tor-proto: reject() now waits until the control message is received.Gabriela Moldovan2023-08-042-1/+11
| | | | | | | | | | | | | | | | As a result, by the time the `reject` future resolves, the stream has been removed from the reactor's stream map and the corresponding END cell has been sent. Fixes #998.
| * tor-proto: allow_stream_requests now waits until the control message is ↵Gabriela Moldovan2023-08-043-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received. `ClientCirc::allow_stream_requests` is now `async` and waits until the `AwaitIncomingStream` control message is processed by the reactor. This guarantees that by the time the `allow_stream_requests` future resolves, the reactor is ready to process BEGIN/BEGIN_DIR/RESOLVE cells. Previously, the client tasks from allow_stream_requests tests had to sleep before sending the BEGIN cell to give the reactor time to process the `AwaitIncomingStream` control message (which tells the reactor to expect incoming BEGIN/BEGIN_DIR/RESOLVE cells on the circuit). Fixes #994
* | proto: methods to wait until a channel/circuit is shut down.Nick Mathewson2023-08-045-4/+59
|/ | | | | | | | | | | | | | | | | | The implementation here is perhaps excessively simple: we put a `oneshot::Sender` in the `Reactor` object, and a `Shared<oneshot::Receiver>` in the circuit or channel. When the reactor is dropped, any copy of the `Shared<Receiver>` will yield `Err(Cancelled)`. I'm marking these methods as experimental because I'm not sure I've thought of all the implications here, and we might want to change things around. Down the road, these methods might want to yield a `Result<>` indicating why the reactor was shut down. This feature was inspired by a request from Saksham Mittal, and a felt need while working on !1472.
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-27 23:52:02 +0000