diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-23 18:51:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-23 18:51:15 -0400 |
| commit | 80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf (patch) | |
| tree | c4e4f09384803fe50fc9a036a2c4c150eebdb4c7 /src | |
| parent | 9a6514ce4f35bee5e083de39466772f535f7f045 (diff) | |
| parent | 8b6a952c94bbc7bd3a9dc3356e708654092e08af (diff) | |
| download | tor-80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf.tar.gz tor-80e9ca411f8822fc7c2ca882cb0fc8d422ebedbf.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto_curve25519.c | 2 | ||||
| -rw-r--r-- | src/test/test_crypto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 3e4004db2e..88c723f37c 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) { diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 645fc9f8a6..cc5af52e97 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1069,7 +1069,7 @@ test_crypto_curve25519_persist(void *arg) tor_free(tag); content[69] ^= 0xff; - tt_int_op(0, ==, write_bytes_to_file(fname, content, st.st_size, 1)); + tt_int_op(0, ==, write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); done: |