From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 23 Mar 2013 22:50:21 +0000 (-0400)
Subject: Avoid clang warnings from implicit off_t->size_t cast
X-Git-Tag: tor-0.2.5.1-alpha~237^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b6a952c94bbc7bd3a9dc3356e708654092e08af;p=thirdparty%2Ftor.git

Avoid clang warnings from implicit off_t->size_t cast
---

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 c531c60838..fcaa0813e7 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1097,7 +1097,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: