diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-09-11 08:30:41 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-09-11 08:30:41 -0400 |
commit | 121f4a9ca43fa88282778adac4597fac8d9deafc (patch) | |
tree | 80baf422b9c7c101f417f2ebfe8530678f4a7357 | |
parent | 48558ed1aa070ef121b339eef88e7822f8e45978 (diff) | |
parent | d02937a20399a3b1c49a3503cabc5b07dc6b5e99 (diff) | |
download | tor-121f4a9ca43fa88282778adac4597fac8d9deafc.tar.gz tor-121f4a9ca43fa88282778adac4597fac8d9deafc.zip |
Merge remote-tracking branch 'public/bug13104_025'
-rw-r--r-- | src/test/test_util.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 1e61bb9452..6f95c7bfc9 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3363,20 +3363,24 @@ test_util_di_ops(void) * against each possible (single-byte) bit difference * some arithmetic bugs only appear with certain bit patterns */ { - const uint8_t z = 0; + uint8_t zz = 0; uint8_t ii = 0; + int z; for (i = 0; i < 256; i++) { ii = (uint8_t)i; - test_eq(tor_memeq(&z, &ii, 1), z == ii); + test_eq(tor_memeq(&zz, &ii, 1), zz == ii); } /* exhaustively white-box test tor_memcmp * against each possible single-byte numeric difference * some arithmetic bugs only appear with certain bit patterns */ - for (i = 0; i < 256; i++) { - ii = (uint8_t)i; - test_eq(tor_memcmp(&z, &ii, 1) > 0 ? GT : EQ, z > ii ? GT : EQ); - test_eq(tor_memcmp(&ii, &z, 1) < 0 ? LT : EQ, ii < z ? LT : EQ); + for (z = 0; z < 256; z++) { + for (i = 0; i < 256; i++) { + ii = (uint8_t)i; + zz = (uint8_t)z; + test_eq(tor_memcmp(&zz, &ii, 1) > 0 ? GT : EQ, zz > ii ? GT : EQ); + test_eq(tor_memcmp(&ii, &zz, 1) < 0 ? LT : EQ, ii < zz ? LT : EQ); + } } } |