This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository torspec.
from f88f643 Merge branch 'tor-gitlab/mr/109' new 5509981 rend-spec: Clarify that enc-key and auth-key may appear multiple times. new ca400dc rend-spec: Document how the cross-certificates (don't) work.
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: rend-spec-v3.txt | 57 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 11 deletions(-)
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository torspec.
commit 5509981ced5c5c24ba0ca4ca2e60a576c916de45 Author: Nick Mathewson nickm@torproject.org AuthorDate: Tue Jan 31 10:57:34 2023 -0500
rend-spec: Clarify that enc-key and auth-key may appear multiple times.
The spec says "exactly once", but that only refers to the ntor variant. --- rend-spec-v3.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index ff2e657..2ede08b 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -1405,6 +1405,14 @@ Table of contents: key of the introduction point Tor node used for the ntor handshake when a client extends to it.
+ "onion-key" SP KeyType SP key.. NL + + [Any number of times] + + Implementations should accept other types of onion keys using this + syntax (where "KeyType" is some string other than "ntor"); + unrecognized key types should be ignored. + "auth-key" NL certificate NL
[Exactly once per introduction point] @@ -1422,6 +1430,14 @@ Table of contents: The key is a base64 encoded curve25519 public key used to encrypt the introduction request to service.
+ "enc-key" SP KeyType SP key.. NL + + [Any number of times] + + Implementations should accept other types of onion keys using this + syntax (where "KeyType" is some string other than "ntor"); + unrecognized key types should be ignored. + "enc-key-cert" NL certificate NL
[Exactly once per introduction point]
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository torspec.
commit ca400dc9f82f8e644d8c3b834a80a41a68748880 Author: Nick Mathewson nickm@torproject.org AuthorDate: Tue Jan 31 11:18:06 2023 -0500
rend-spec: Document how the cross-certificates (don't) work.
(See text for more info!) --- rend-spec-v3.txt | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/rend-spec-v3.txt b/rend-spec-v3.txt index 2ede08b..a8ac264 100644 --- a/rend-spec-v3.txt +++ b/rend-spec-v3.txt @@ -1417,18 +1417,28 @@ Table of contents:
[Exactly once per introduction point]
- The certificate is a proposal 220 certificate wrapped in "-----BEGIN - ED25519 CERT-----" cross-certifying the introduction point - authentication key using the descriptor signing key. The introduction - point authentication key is included in the mandatory signing-key - extension. The certificate type must be [09]. + The certificate is a proposal 220 certificate wrapped in + "-----BEGIN ED25519 CERT-----". It contains the introduction + point authentication key (`KP_hs_intro_tid`), signed by + the descriptor signing key (`KP_hs_desc_sign`). The + certificate type must be [09], and the signing key extension + is mandatory. + + NOTE: This certificate was originally intended to be + constructed the other way around: the signing and signed keys + are meant to be reversed. However, C tor implemented it + backwards, and other implementations now need to do the same + in order to conform. (Since this section is inside the + descriptor, which is _already_ signed by `KP_hs_desc_sign`, + the verification aspect of this certificate serves no point in + its current form.)
"enc-key" SP "ntor" SP key NL
[Exactly once per introduction point]
The key is a base64 encoded curve25519 public key used to encrypt - the introduction request to service. + the introduction request to service. (`KP_hs_intro_ntor`)
"enc-key" SP KeyType SP key.. NL
@@ -1445,13 +1455,22 @@ Table of contents: Cross-certification of the encryption key using the descriptor signing key.
- For "ntor" keys, certificate is a proposal 220 certificate wrapped - in "-----BEGIN ED25519 CERT-----" armor, cross-certifying the - descriptor signing key with the ed25519 equivalent of a curve25519 - public encryption key derived using the process in proposal 228 - appendix A. The certificate type must be [0B], and the signing-key + For "ntor" keys, certificate is a proposal 220 certificate + wrapped in "-----BEGIN ED25519 CERT-----" armor. The subject + key is the the ed25519 equivalent of a curve25519 public + encryption key (`KP_hs_intro_ntor`), with the ed25519 key + derived using the process in proposal 228 appendix A. The + signing key is the descriptor signing key (`KP_hs_desc_sign`). + The certificate type must be [0B], and the signing-key extension is mandatory.
+ NOTE: As with "auth-key", this certificate was intended to be + constructed the other way around. However, for compatibility + with C tor, implementations need to construct it this way. It + serves even less point than "auth-key", however, since the + encryption key `KP_hs_intro_ntor` is already available from + the `enc-key` entry. + "legacy-key" NL key NL
[None or at most once per introduction point]
tor-commits@lists.torproject.org
-
gitolite role