From ef6fa07e4830dde86fce2d06bf9da44d5c1c79b9 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sat, 15 Jan 2011 11:32:56 -0500 Subject: Fix a couple of non-cleared key issues in hidden services we need to do more hunting, but this fixes the ones mentioned in 2385. --- src/or/rendclient.c | 2 ++ src/or/rendservice.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'src/or') diff --git a/src/or/rendclient.c b/src/or/rendclient.c index ab18d35298..95875465cb 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -717,8 +717,10 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, * attach only the connections that are waiting on this circuit, rather * than trying to attach them all. See comments bug 743. */ connection_ap_attach_pending(); + memset(keys, 0, sizeof(keys)); return 0; err: + memset(keys, 0, sizeof(keys)); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); return -1; } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 07f01aead9..a650eda405 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1214,8 +1214,10 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, memcpy(cpath->handshake_digest, keys, DIGEST_LEN); if (extend_info) extend_info_free(extend_info); + memset(keys, 0, sizeof(keys)); return 0; err: + memset(keys, 0, sizeof(keys)); if (dh) crypto_dh_free(dh); if (launched) circuit_mark_for_close(TO_CIRCUIT(launched), reason); -- cgit v1.2.3-54-g00ecf