aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-23 18:51:15 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-23 18:51:15 -0400
commit80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf (patch)
treec4e4f09384803fe50fc9a036a2c4c150eebdb4c7 /src/common
parent9a6514ce4f35bee5e083de39466772f535f7f045 (diff)
parent8b6a952c94bbc7bd3a9dc3356e708654092e08af (diff)
downloadtor-80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf.tar
tor-80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/crypto_curve25519.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index 3e4004db2..88c723f37 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -169,7 +169,7 @@ curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out,
end:
if (content) {
- memwipe(content, 0, st.st_size);
+ memwipe(content, 0, (size_t) st.st_size);
tor_free(content);
}
if (r != 0) {