the onionskin challenge length was 30 bytes longer than necessary

(i think ;)


svn:r971

src/or/onion.c

@@ -713,7 +713,7 @@ onion_skin_server_handshake(char *onion_skin, /* ONIONSKIN_CHALLENGE_LEN bytes *
   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 */

src/or/or.h

@@ -427,7 +427,7 @@ struct crypt_path_t {
 };
 
 #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;