commit fa2c8ae9f7f753c70a8220ab937854b74318cfca Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 25 09:33:02 2017 -0400
may->must, and split a sentence into two
The original was incorrect to say "You may do A if B, C otherwise." but it seems less clear to say "You MUST do A if B, C otherwise." than it is to say "If A, you MUST B. If not A, you MUST C."
Closes ticket 22951 --- tor-spec.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tor-spec.txt b/tor-spec.txt index fd2aaf7..9ccdabe 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -500,11 +500,13 @@ see tor-design.pdf. as part of its answer if it chooses to authenticate, and a NETINFO cell (4.5). As soon as it gets the CERTS cell, the initiator knows whether the responder is correctly authenticated. At this point the - initiator may send a NETINFO cell if it does not wish to - authenticate, or a CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO - cell if it does. When this handshake is in use, the first cell must - be VERSIONS, VPADDING or AUTHORIZE, and no other cell type is allowed to - intervene besides those specified, except for PADDING and VPADDING cells. + initiator behaves differently depending on whether it wants to + authenticate or not. If it does not want to authenticate, it MUST + send a NETINFO cell. If it does want to authenticate, it MUST send a + CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO. When this + handshake is in use, the first cell must be VERSIONS, VPADDING or + AUTHORIZE, and no other cell type is allowed to intervene besides + those specified, except for PADDING and VPADDING cells.
The AUTHORIZE cell type is reserved for future use by scanning-resistance designs.