aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-23 17:04:38 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-23 17:04:38 -0400
commita5232e0c4c572cdff85701f698b8b90c9443d7e4 (patch)
tree1bc0db8feaa3a808518b5c277481eefacb984277 /src/test
parent57810c333a38c72c1e361c02e31de7712d1f221a (diff)
downloadtor-a5232e0c4c572cdff85701f698b8b90c9443d7e4.tar
tor-a5232e0c4c572cdff85701f698b8b90c9443d7e4.tar.gz
Fix GCC 4.6's new -Wunused-but-set-variable warnings.
Most instances were dead code; for those, I removed the assignments. Some were pieces of info we don't currently plan to use, but which we might in the future. For those, I added an explicit cast-to-void to indicate that we know that the thing's unused. Finally, one was a case where we were testing the wrong variable in a unit test. That one I fixed. This resolves bug 3208.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_crypto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 781081a4a..bf2cc4817 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -69,7 +69,7 @@ test_crypto_rng(void)
uint64_t big;
char *host;
j = crypto_rand_int(100);
- if (i < 0 || i >= 100)
+ if (j < 0 || j >= 100)
allok = 0;
big = crypto_rand_uint64(U64_LITERAL(1)<<40);
if (big >= (U64_LITERAL(1)<<40))
@@ -240,11 +240,13 @@ test_crypto_sha(void)
/* Test SHA-1 with a test vector from the specification. */
i = crypto_digest(data, "abc", 3);
test_memeq_hex(data, "A9993E364706816ABA3E25717850C26C9CD0D89D");
+ tt_int_op(i, ==, 0);
/* Test SHA-256 with a test vector from the specification. */
i = crypto_digest256(data, "abc", 3, DIGEST_SHA256);
test_memeq_hex(data, "BA7816BF8F01CFEA414140DE5DAE2223B00361A3"
"96177A9CB410FF61F20015AD");
+ tt_int_op(i, ==, 0);
/* Test HMAC-SHA-1 with test cases from RFC2202. */