[tor-commits] [torspec/master] Make the rendezvous-cookie passing more explicit.

[nickm at torproject.org]

commit f0aa17a275d4b5cabf5d0e6531560940b6f205f8
Author: George Kadianakis <desnacked at riseup.net>
Date:   Sat Jan 4 20:19:49 2014 +0200

    Make the rendezvous-cookie passing more explicit.
    
    It's not clear that REND_TOKEN refers to the rendezvous cookie.
---
 proposals/224-rend-spec-ng.txt |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 0f94745..055f171 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -1235,7 +1235,7 @@ Status: Draft
 
    The decrypted plaintext must have the form:
 
-      REND_TOKEN                                 [20 bytes]
+      RENDEZVOUS_COOKIE                          [20 bytes]
       Any number of times:
           EXT_FIELD_TYPE                         [1 byte]
           EXT_FIELD_LEN                          [1 byte]
@@ -1507,6 +1507,9 @@ Status: Draft
        HANDSHAKE_INFO             [variable; depends on handshake type
                                    used.]
 
+   where RENDEZVOUS_COOKIE is the cookie suggested by the client
+   during the introduction (see [PROCESS_INTRO2]).
+
    If the cookie matches the rendezvous cookie set on any
    not-yet-connected circuit on the rendezvous point, the rendezvous
    point connects the two circuits, and sends a RENDEZVOUS2 cell to the