[or-cvs] the onionskin challenge length was 30 bytes longer than nec...

[Roger Dingledine]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	onion.c or.h 
Log Message:
the onionskin challenge length was 30 bytes longer than necessary
(i think ;)


Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- onion.c	17 Dec 2003 21:09:31 -0000	1.115
+++ onion.c	5 Jan 2004 05:23:03 -0000	1.116
@@ -713,7 +713,7 @@
   if (len < 0)
     goto err;
 
-  /* send back H(K) as proof that we learned K. */
+  /* send back H(K|0) as proof that we learned K. */
   memcpy(handshake_reply_out+DH_KEY_LEN, key_material, 20);
 
   /* use the rest of the key material for our shared keys, digests, etc */

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- or.h	2 Jan 2004 09:03:38 -0000	1.216
+++ or.h	5 Jan 2004 05:23:03 -0000	1.217
@@ -427,7 +427,7 @@
 };
 
 #define DH_KEY_LEN CRYPTO_DH_SIZE
-#define ONIONSKIN_CHALLENGE_LEN (16+DH_KEY_LEN+6+8+16)
+#define ONIONSKIN_CHALLENGE_LEN (16+DH_KEY_LEN)
 #define ONIONSKIN_REPLY_LEN (DH_KEY_LEN+20)
 
 typedef struct crypt_path_t crypt_path_t;