[minion-cvs] Junk-related patches to minion-spec. Bugs found by wea...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	minion-spec.txt 
Log Message:
Junk-related patches to minion-spec.  Bugs found by weasel.

Index: minion-spec.txt
===================================================================
RCS file: /home/minion/cvsroot/doc/spec/minion-spec.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- minion-spec.txt	7 Oct 2003 20:14:09 -0000	1.20
+++ minion-spec.txt	9 Oct 2003 04:05:47 -0000	1.21
@@ -686,7 +686,7 @@
         //             -256
         //           = 2048-256 - SUM(SIZE_1 ... SIZE_(i-1))
         //           = 2048 - 256 - len(J_{i-1})
-        OFFSET = PADDING_LEN  + Len(J_i) - 256
+        OFFSET = HEADER_LEN - PK_ENC_LEN - Len(J_(i-1))
         J_i = J_i ^ Stream_i[OFFSET:Len(J_i)]
      end
 
@@ -707,7 +707,7 @@
         REST = H0[PK_MAX_DATA_LEN : Len(H0) - PK_MAX_DATA_LEN]
 
         EREST = Encrypt(K_i, REST)
-        DIGEST = HASH(EREST | J_i)
+        DIGEST = HASH(EREST | J_(i-1))
 
         SH = SHS(V, SK_i, DIGEST, len(RI), RT, RI)
         UNDERFLOW = Min(PK_MAX_DATA_LEN - SH_LEN, 0)