[minion-cvs] Apply patch from jean-rene

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/doc/spec
In directory moria.mit.edu:/tmp/cvs-serv15197

Modified Files:
	E2E-spec.txt 
Log Message:
Apply patch from jean-rene

Index: E2E-spec.txt
===================================================================
RCS file: /home/minion/cvsroot/doc/spec/E2E-spec.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- E2E-spec.txt	17 Dec 2003 00:44:07 -0000	1.18
+++ E2E-spec.txt	6 Aug 2004 19:35:07 -0000	1.19
@@ -215,8 +215,7 @@
        ARGUMENTS
            M: the message to send
            PS: payload sized (fixed)
-           EXF: expansion factor (fixed: everyone must use the same EXF,
-                                 see below.)
+           EXF: expansion factor 
 
        Let M_SIZE = CEIL(LEN(M) / PS)
 
@@ -242,6 +241,8 @@
   [If we find an unpatented O(N) algorithm, we use it instead of this
    junk. -NM]
 
+  Everyone must use the same EXF. The value of EXF is 4/3. 
+
 2.1.3. Building blocks: whitening
 
    While some fragments of a message are stored, but before the entire
@@ -383,7 +384,7 @@
 2.2.2. Generating plaintext forward messages
 
    To send a plaintext forward message M, we first let PAYLOADS =
-   PACKETIZE(M, 28KB).  For every PAYLOAD_i, we set TAG_i = to a
+   PACKETIZE_MESSAGE(M, 0).  For every PAYLOAD_i, we set TAG_i = to a
    randomly chosen 159-bit integer.
 
    We then transmit each payload with its corresponding tag.
@@ -415,7 +416,7 @@
 
    We specify a solution to 2 here.  When generating plaintext forward
    fragmented messages, the message generator uses a routing type of
-   "FRAGMENT" (0x0103), an empty routing into, and prepends the
+   "FRAGMENT" (0x0103), an empty routing info, and prepends the
    following fields to the message body before compressing and
    fragmenting it:
 
@@ -433,7 +434,7 @@
 
    To send an encrypted forward message M to a user with an RSA public
    key PK with length PKLEN (in octets), we set PAYLOADS =
-   PACKETIZE(M, 28KB-PK_OVERHEAD_LEN+TAG_LEN-SPRP_KEY_LEN).  (We lose 42
+   PACKETIZE_MESSAGE(M, PK_OVERHEAD_LEN-TAG_LEN+SPRP_KEY_LEN).  (We lose 42
    octets to OAEP padding and 20 to encode the session key, but gain
    20 by spilling the encrypted data into the decoding tag.)
 
@@ -454,7 +455,7 @@
 2.2.4.   Generating reply messages
 
    To send a reply message M to an anonymous recipient, we set
-   PAYLOADS = PACKETIZE(M, 28KB).   We send each PAYLOAD_i with a
+   PAYLOADS = PACKETIZE(M, 0).   We send each PAYLOAD_i with a
    separate SURB_i -- we must have enough to use a different SURB for
    each message.  We do not need to include TAG (decoding handle)
    fields: they are a part of the SURB.