| Commit message (Collapse) | Author | Age | Files | Lines |
| ... | |
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
I had planned to make this code accept extensions of unknown type,
but for now I'm backing out of that plan: the set of extensions we
send influences the set that we're willing to receive.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
doc: fix malformatted comment in SliceWriterError
See merge request tpo/core/arti!1503
|
| | | |/
| |/| |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
tor-cert: actually use dangerously_assume_timely
See merge request tpo/core/arti!1497
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
This commit makes a trait function use another currently unused trait
function, thereby increasing the test coverage, as well as being
potentially more correct from a semantic point of view.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
test: provide a test for expired certificates
See merge request tpo/core/arti!1496
|
| | |/ /
| | |
| | |
| | |
| | | |
This commit implements a test for an expired Ed25519 certificate within
the `tor_cert` crate.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
test: encode unrecognized `tor_cert::CertExt`
See merge request tpo/core/arti!1495
|
| | | | | |
|
| | |/ /
| | |
| | |
| | |
| | | |
This commit introduces a test for unrecognized `tor_cert::CertExt`
fields.
|
| | | |
| | |
| | |
| | | |
This comment will form the basis for the protocol name registry.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
This helper is no longer needed (the logic from
`parse_ssh_format_erased` changed).
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | | |
This brings in the changes from #936.
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| | |
| |
| |
| | |
Closes #993
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |/ |
|
| |\
| |
| |
| |
| | |
tor-proto: Implement IncomingStream::discard()
See merge request tpo/core/arti!1484
|
| | |
| |
| |
| | |
These functions only ever return `Bug` errors.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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).
|
| |\ \
| | |
| | |
| | |
| | | |
tor-error: Remove KeystoreFsPermissions variant.
See merge request tpo/core/arti!1487
|
| | |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
As demanded by rustfmt
|
| | |
| |
| |
| | |
This complements the new `check_bridge_pt` test.
|
| |/
|
|
| |
This is a bugfix. Perhaps it is a security fix?
|
| |\
| |
| |
| |
| | |
tor-proto: Replace IncomingStreamMsg with IncomingStreamRequest.
See merge request tpo/core/arti!1477
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |\ \
| | |
| | |
| | |
| | | |
tor-proto: Implement `Drop` for `IncomingStream`.
See merge request tpo/core/arti!1476
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | |/ |
|
| | | |
|