aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-20 11:12:51 -0400
committerNick Mathewson <nickm@torproject.org>2014-10-20 11:12:51 -0400
commite3d166b7a63b4f0c248e20b759dba2ccb8d30092 (patch)
tree6cd71bd4e7fc60e9573106c71ebfbc3cff030b9d /src/or
parentd6fab2afd7f37a3a31063654a8f5451d5d290bcf (diff)
parent2e1f5c1fc0f6239a8bb9f409f1f170fb21ce1a37 (diff)
downloadtor-e3d166b7a63b4f0c248e20b759dba2ccb8d30092.tar.gz
tor-e3d166b7a63b4f0c248e20b759dba2ccb8d30092.zip
Merge remote-tracking branch 'teor/memwipe-more-keys'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 5d1d2ff337..bbbf9c4b84 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -488,7 +488,7 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
if (curve25519_keypair_write_to_file(keys_out, fname, tag)<0) {
tor_log(severity, LD_FS,
"Couldn't write generated key to \"%s\".", fname);
- memset(keys_out, 0, sizeof(*keys_out));
+ memwipe(keys_out, 0, sizeof(*keys_out));
goto error;
}
} else {