mirrors/arti.git/crates/tor-netdoc/src, branch arti-v2.3.0mirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v2.3.02026-04-30T14:07:28ZMerge branch 'directory-signature-hash-algo' into 'main'2026-04-30T14:07:28ZClara Englercve@cve.cx2026-04-30T14:07:28Zurn:sha1:733b55b56251f30b7235077bb691e26ae211a73c
Unknown keyword handling fixes; use a more principled type for directory signature hash algo
See merge request tpo/core/arti!3923tor-netdoc: Un-gate every cfg feature = "hsdesc-inner-docs"2026-04-30T10:28:41ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-28T09:37:44Zurn:sha1:21dbeea5523867397586cee62940f7f8562d694e
Part of #2492 phase 2.
tor-cert: Ed25519CertBuilder: do builder fn rename2026-04-29T16:49:21ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-28T09:58:04Zurn:sha1:d90b703d0c4bc4ffb9068fb5c25fc78e72743961
Change all call sites.
This completes the rename.
tor-netdoc: Use poc's DirectorySignatureHashAlgo2026-04-29T10:38:50ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-29T10:28:49Zurn:sha1:c78493ff61a51b915f9ddbe2e293eba648da0be3
This type is now directly suitable for use in directory signatures.
While we're changing its type, rename the digest algorithm name field
from `digestname` to `digest_algo`. (The spec says `algorithm` but I
don't think we're going to reuse `direcctory-signature` for non-RSA
signatures so this is just the hash algorithm.)
tor-netdoc: Promote DirectorySignatureHashAlgo from poc as nasty macro2026-04-29T10:38:37ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-29T10:28:02Zurn:sha1:3d1f272aab1c4815bef932c09efa5e12ed318a9c
We want DirectorySignatureHashAlgo for prod's directory Signature
type.
However, for complex cfg gate and macro scoping reasons, we can't just
move the definition out of poc. Hence this rather unpleasant
intermediate state. This will go away, and become normal again, when
we can abolish poc's signatures and have poc use a prod signature
type.
Review with
git show --color=always --color-moved-ws=allow-indentation-change --color-moved
tor-netdoc: poc: make DirectorySignatureHashAlgo serialise properly2026-04-29T10:20:28ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-27T15:13:12Zurn:sha1:24b773c0074d68b7ee6771d3652c7e3794a46130tor-netdoc: Introduce KeywordOrString2026-04-29T10:20:28ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-27T14:32:27Zurn:sha1:77cb35dadc2c6915f56de7df35cfec9aaecbfa02
We're going to use this for `directory-signature`'s hash algorithm,
which the current code always treats as a string!
tor-netdoc: Improvement to Unknown API: make it exhaustive2026-04-29T10:20:28ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-27T14:54:57Zurn:sha1:c67df7070159dc7b62769678f01a1c55db2246c6tor-netdoc: Improvement to Unknown API: make disregarding more explicit2026-04-29T10:20:28ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-27T14:37:22Zurn:sha1:330fa170bb755934534b26627a4d75c7724083a4
Make the operation of disregarding the possible existence of
already-discarded information, more explicit.
tor-netdoc: Move FromStr and Display from NormalItemArgument to impls2026-04-29T10:20:28ZIan Jacksonijackson@chiark.greenend.org.uk2026-04-27T14:43:55Zurn:sha1:4c75ba0cb8c036e4b330f1f10740e7c29e8379de
This allows implementing NormalItemArgument for types that can only be
parsed, or only displayed - or other combinations.
I noticed this restriction while inventing a type I later decided was
unnecessary. I still think it's a good change.
There is no practical impact elsewhere, since in practice downstream
code implements NormalItemArgument rather than relying on it.