Set handshake_state to NULL before appending cpath hops

svn:r1505

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 566e6d945ef47bc397aa32b1b04be14d84ccfe5c..86f9b34faf45ae8306a2e895247ce83d81e60e36 100644 (file)
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -204,6 +204,9 @@ rend_client_receive_rendezvous(circuit_t *circ, const char *request, int request
     goto err;
   }
 
+  crypto_dh_free(hop->handshake_state);
+  hop->handshake_state = NULL;
+
   /* All is well. Extend the circuit. */
   circ->purpose = CIRCUIT_PURPOSE_C_REND_JOINED;
   hop->state = CPATH_STATE_OPEN;

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index c4dcd0979c454f41fc3f4ebcaca1dfd84dab0e49..4325ec9e7a56b7b3390f2f1dfe9bbc4dadf6f251 100644 (file)
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -588,6 +588,9 @@ rend_service_rendezvous_is_ready(circuit_t *circuit)
     goto err;
   }
 
+  crypto_dh_free(hop->handshake_state);
+  hop->handshake_state = NULL;
+
   /* Append the cpath entry. */
   hop->state = CPATH_STATE_OPEN;
   onion_append_to_cpath(&circuit->cpath, hop);