nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-23 18:51:15 -04:00
commit 80e9ca411f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/crypto_curve25519.c
View File

@ -169,7 +169,7 @@ curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out,
end: end:
if (content) { if (content) {
memwipe(content, 0, st.st_size); memwipe(content, 0, (size_t) st.st_size);
tor_free(content); tor_free(content);
} }
if (r != 0) { if (r != 0) {

2
src/test/test_crypto.c
View File

@ -1069,7 +1069,7 @@ test_crypto_curve25519_persist(void *arg)
tor_free(tag); tor_free(tag);
content[69] ^= 0xff; 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)); tt_int_op(-1, ==, curve25519_keypair_read_from_file(&keypair2, &tag, fname));
done: done: