diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 14:15:19 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 14:15:19 -0500 |
| commit | a7790d48af73760a2ae10fcff70b319914316b90 (patch) | |
| tree | 7aaecb7dfc8b339741d261bcbaa7ebcfcffbbeb4 /src/or/rendservice.c | |
| parent | 1393985768d760e11e45faabb537d28248306e8b (diff) | |
| parent | ef6fa07e4830dde86fce2d06bf9da44d5c1c79b9 (diff) | |
| download | tor-a7790d48af73760a2ae10fcff70b319914316b90.tar.gz tor-a7790d48af73760a2ae10fcff70b319914316b90.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1d64cf41e3..f1480e0b7f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1165,8 +1165,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); |