From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 19 Mar 2003 21:17:57 +0000 (+0000)
Subject: Fix op handshake for longer keys
X-Git-Tag: tor-0.0.2pre8~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51ed97504b4d7246537f99993f64fc422d9e5d6d;p=thirdparty%2Ftor.git

Fix op handshake for longer keys


svn:r200
---

diff --git a/src/or/connection_op.c b/src/or/connection_op.c
index 993646947a..08ccb3da0f 100644
--- a/src/or/connection_op.c
+++ b/src/or/connection_op.c
@@ -59,13 +59,14 @@ int op_handshake_process_keys(connection_t *conn) {
         crypto_perror());
     return -1;
   }
+  /* XXXX Check length */
 
   log(LOG_DEBUG,"Successfully decrypted keys from new OP.");
 
   conn->bandwidth = ntohl(*((uint32_t *)auth_plain));
 
   crypto_cipher_set_key(conn->b_crypto, auth_plain+4);
-  crypto_cipher_set_key(conn->f_crypto, auth_plain+12);
+  crypto_cipher_set_key(conn->f_crypto, auth_plain+20);
 #if 0
   printf("f_session_key: ");
   for(x=0;x<8;x++) {