Fix op handshake for longer keys

svn:r200

diff --git a/src/or/connection_op.c b/src/or/connection_op.c
index 993646947a01040f5f671d6d1f43ead373dda467..08ccb3da0f49b0bbef44cb2dd7f85a5eb4e1350a 100644 (file)
--- 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++) {