summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-01-05 05:23:03 +0000
committerRoger Dingledine <arma@torproject.org>2004-01-05 05:23:03 +0000
commitd6ce65afd67b8d8dae0e945ff0e3246b7475ca7b (patch)
tree0dd61b2981ee11c7b190a4f63b884b7723bed4c7
parent607078cf7000ce3de1dedd38c7b51b49a044ee3a (diff)
downloadtor-d6ce65afd67b8d8dae0e945ff0e3246b7475ca7b.tar.gz
tor-d6ce65afd67b8d8dae0e945ff0e3246b7475ca7b.zip
the onionskin challenge length was 30 bytes longer than necessary
(i think ;) svn:r971
-rw-r--r--src/or/onion.c2
-rw-r--r--src/or/or.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/onion.c b/src/or/onion.c
index 7e3c7d3438..e25dac8c18 100644
--- a/src/or/onion.c
+++ b/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 */
diff --git a/src/or/or.h b/src/or/or.h
index 42b89c3ba1..76d2afeb5c 100644
--- a/src/or/or.h
+++ b/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;