commit cbcd62886a76e11328681281ab693ed73f89036b Author: David Goulet <dgoulet@torproject.org> Date: Tue Oct 11 15:11:39 2016 -0400 prop224: Minor syntax fix mostly wrapping on 80 chars Signed-off-by: David Goulet <dgoulet@torproject.org> --- proposals/224-rend-spec-ng.txt | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 0e039e1..edb45ae 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -35,7 +35,7 @@ Table of contents: 2.3. Publishing shared random values [PUB-SHAREDRANDOM] 2.3.1. Client behavior in the absense of shared random values 2.3.2. Hidden services and changing shared random values - 2.4. Hidden service descriptors: outer wrapper [DESC-OUTER] + 2.4. Hidden service descriptors: outer wrapper [DESC-OUTER] 2.5. Hidden service descriptors: encryption format [ENCRYPTED-DATA] 3. The introduction protocol 3.1. Registering an introduction point [REG_INTRO_POINT] @@ -691,8 +691,9 @@ Table of contents: 2.2.2. When to publish a hidden service descriptor [WHEN-HSDESC] - Hidden services periodically publish their descriptor to the responsible HSDirs. - The set of responsible HSDirs is determined as specified in [WHERE-HSDESC]. + Hidden services periodically publish their descriptor to the responsible + HSDirs. The set of responsible HSDirs is determined as specified in + [WHERE-HSDESC]. Specifically, everytime a hidden service publishes its descriptor, it also sets up a timer for a random time between 60 minutes and 120 minutes in the @@ -709,7 +710,8 @@ Table of contents: overwhelmed by every host uploading at the same time. To avoid this thundering herd problem, hidden services upload descriptors - for the upcoming time period at a random time _before_ the time period starts. + for the upcoming time period at a random time _before_ the time period + starts. For the above "descriptor overlap" system to work, fresh shared random values must be available multiple hours *before* the time period changes, so @@ -763,8 +765,8 @@ Table of contents: INT_8(period_num) ) where shared_random_value is the shared value generated by the authorities - in section [PUB-SHAREDRANDOM], and node_identity is the ed25519 identity key - of the node. + in section [PUB-SHAREDRANDOM], and node_identity is the ed25519 identity + key of the node. Finally, for replicanum in 1...hsdir_n_replicas, the hidden service host uploads descriptors to the first hsdir_spread_store nodes whose @@ -901,7 +903,8 @@ Table of contents: [Exactly once] The lifetime of a descriptor in minutes. An HSDir SHOULD expire the - hidden service descriptor at least LifetimeMinutes after it was uploaded. + hidden service descriptor at least LifetimeMinutes after it was + uploaded. The LifetimeMinutes field can take values between 30 and 3000 (50 hours). @@ -955,7 +958,8 @@ Table of contents: descriptor even if the content of the descriptor hasn't changed. (So that we don't leak whether the intro point list etc. changed) - secret_input = blinded_public_key | subcredential | INT_8(revision_counter) + secret_input = blinded_public_key | subcredential | + INT_8(revision_counter) keys = KDF(secret_input, salt, "hsdir-encrypted-data", S_KEY_LEN + S_IV_LEN + MAC_KEY_LEN) @@ -1137,7 +1141,8 @@ Table of contents: Otherwise, the node must associate the key with the circuit, for use later in INTRODUCE1 cells. -3.1.2. Registering an introduction point on a legacy Tor node [LEGACY_EST_INTRO] +3.1.2. Registering an introduction point on a legacy Tor node + [LEGACY_EST_INTRO] Tor nodes should also support an older version of the ESTABLISH_INTRO cell, first documented in rend-spec.txt. New hidden service hosts @@ -1355,7 +1360,8 @@ Table of contents: Note that the old TAP-derived protocol of the previous hidden service design achieved the first two requirements, but not the third. -3.3.2. Example encryption handshake: ntor with extra data [NTOR-WITH-EXTRA-DATA] +3.3.2. Example encryption handshake: ntor with extra data + [NTOR-WITH-EXTRA-DATA] [TODO: relocate this]