summaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-15 14:17:59 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-15 14:17:59 -0500
commit07888ed8e431b10d21d18e86092e20ddef0a2bca (patch)
tree02a81faf9ef9ff526a490f7c7c5c41d51ee59428 /src/or/rendservice.c
parent1758ef51de8b44141184a36bcd36dea349d9e65d (diff)
parenta7790d48af73760a2ae10fcff70b319914316b90 (diff)
downloadtor-07888ed8e431b10d21d18e86092e20ddef0a2bca.tar.gz
tor-07888ed8e431b10d21d18e86092e20ddef0a2bca.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r--src/or/rendservice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 9f364b0a85..c920ecf040 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1166,8 +1166,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);