aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | cell: Add code to iterate over IntroEstablished extensionsNick Mathewson2023-08-152-1/+8
| | |
| * | cell, docs: Clarify what we mean by "Unrecognized".Nick Mathewson2023-08-151-2/+3
| | |
| * | hsservice: Send extensions in establish_intro msgs.Nick Mathewson2023-08-151-9/+18
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'fix-weird-comment' into 'main'Ian Jackson2023-08-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | doc: fix malformatted comment in SliceWriterError See merge request tpo/core/arti!1503
| * | | doc: fix malformatted comment in SliceWriterErrorEmil Engler2023-08-141-1/+1
| | |/ | |/|
* | | Merge branch 'dangerously_assume_timely' into 'main'Ian Jackson2023-08-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | tor-cert: actually use dangerously_assume_timely See merge request tpo/core/arti!1497
| * | | tor-cert: actually use dangerously_assume_timelyEmil Engler2023-08-101-1/+1
| |/ / | | | | | | | | | | | | | | | 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.
* | | Merge branch 'test-expired-certs' into 'main'Ian Jackson2023-08-161-0/+37
|\ \ \ | | | | | | | | | | | | | | | | test: provide a test for expired certificates See merge request tpo/core/arti!1496
| * | | test: provide a test for expired certificatesEmil Engler2023-08-101-0/+37
| |/ / | | | | | | | | | | | | This commit implements a test for an expired Ed25519 certificate within the `tor_cert` crate.
* | | Merge branch 'coverage-encode' into 'main'Ian Jackson2023-08-161-0/+15
|\ \ \ | | | | | | | | | | | | | | | | test: encode unrecognized `tor_cert::CertExt` See merge request tpo/core/arti!1495
| * | | doc: note unreachable codeEmil Engler2023-08-101-0/+1
| | | |
| * | | test: encode unrecognized `tor_cert::CertExt`Emil Engler2023-08-101-0/+14
| |/ / | | | | | | | | | | | | This commit introduces a test for unrecognized `tor_cert::CertExt` fields.
* | | Merge branch 'bump-ssh-key' into 'main'gabi-2502023-08-1611-190/+261
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | keymgr: Bump ssh-key to 0.6.0. Closes #936 See merge request tpo/core/arti!1508
| * | | keymgr: Write a registry sketch.Gabriela Moldovan2023-08-161-2/+49
| | | | | | | | | | | | | | | | This comment will form the basis for the protocol name registry.
| * | | tor-keymgr: Add sec1 0.7.3 dependency.Gabriela Moldovan2023-08-162-0/+11
| | | |
| * | | 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-163-19/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-122/+79
|/ / / | | | | | | | | | This brings in the changes from #936.
* | | Merge branch 'bump-backtrace' into 'main'Nick Mathewson2023-08-152-2/+2
|\ \ \ | |_|/ |/| | | | | | | | tor-error, arti: Bump backtrace to 0.3.68. See merge request tpo/core/arti!1509
| * | 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
* | Merge branch 'cargo_audit_2022_0093' into 'main'Nick Mathewson2023-08-141-0/+8
|\ \ | | | | | | | | | | | | cargo_audit: Add an exception for RUSTSEC-2022-0093. See merge request tpo/core/arti!1506
| * | cargo_audit: Add an exception for RUSTSEC-2022-0093.Nick Mathewson2023-08-141-0/+8
| | | | | | | | | | | | | | | | | | | | | This is the API deficiency in ed25519-dalek v1 that allows you to mismatch public and private keys, leading to a (fatal) double-signing attack. We have worked around this in our current design, so it's appropriate to suppress this warning for now.
* | | Merge branch 'establish_intro_v2' into 'main'Nick Mathewson2023-08-1418-53/+468
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Implement circuit binding and start on intro-point establisher logic Closes #953 and #993 See merge request tpo/core/arti!1472
| * | Start working on the backend for an IptEstablisher.Nick Mathewson2023-08-143-8/+249
| | | | | | | | | | | | | | | | | | | | | | | | 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-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
| | | |