[or-cvs] r11152: spec clarification noted by Stefan K. (in tor/trunk: . doc/spec)

[nickm at seul.org]

Author: nickm
Date: 2007-08-17 16:31:56 -0400 (Fri, 17 Aug 2007)
New Revision: 11152

Modified:
   tor/trunk/
   tor/trunk/doc/spec/tor-spec.txt
Log:
 r14629 at catbus:  nickm | 2007-08-17 16:14:05 -0400
 spec clarification noted by Stefan K.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14629] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/spec/tor-spec.txt
===================================================================
--- tor/trunk/doc/spec/tor-spec.txt	2007-08-17 20:31:54 UTC (rev 11151)
+++ tor/trunk/doc/spec/tor-spec.txt	2007-08-17 20:31:56 UTC (rev 11152)
@@ -293,11 +293,14 @@
 
    The CircID for a CREATE cell is an arbitrarily chosen 2-byte integer,
    selected by the node (OP or OR) that sends the CREATE cell.  To prevent
-   CircID collisions, when one OR sends a CREATE cell to another OR, it chooses
+   CircID collisions, when one node sends a CREATE cell to another, it chooses
    from only one half of the possible values based on the ORs' public
-   identity keys: if the sending OR has a lower key, it chooses a CircID with
+   identity keys: if the sending node has a lower key, it chooses a CircID with
    an MSB of 0; otherwise, it chooses a CircID with an MSB of 1.
 
+   (An OP with no public key MAY choose any CircID it wishes, since an OP
+   never needs to process a CREATE cell.)
+
    Public keys are compared numerically by modulus.
 
    As usual with DH, x and y MUST be generated randomly.