aboutsummaryrefslogtreecommitdiff
path: root/tor-spec.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-06 13:45:16 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-06 13:45:16 -0400
commit1bbf52873ca7d585f36596ae67bc61d49105af12 (patch)
tree848e122ee0621fc0591b69d905b1750bbba6ec0f /tor-spec.txt
parent3bdbe6c9f290603c51c9b6700df5473f5c8b9073 (diff)
downloadtorspec-1bbf52873ca7d585f36596ae67bc61d49105af12.tar.gz
torspec-1bbf52873ca7d585f36596ae67bc61d49105af12.zip
Correct description of which cells are allowed during the handshake
We said that PADDING was allowed, but it wasn't. Bug 22934.
Diffstat (limited to 'tor-spec.txt')
-rw-r--r--tor-spec.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/tor-spec.txt b/tor-spec.txt
index 176dfc1..600d457 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -504,9 +504,9 @@ see tor-design.pdf.
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
+ 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.
+ those specified, except for VPADDING cells.
The AUTHORIZE cell type is reserved for future use by scanning-resistance
designs.