From 6837c5ac80e3624c6dc3a82d03e50d68b2f5a989 Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Mon, 26 Oct 2026 17:13:36 +0100 Subject: Second run of making variable and function names more readable, urlencoder now matches overall naming scheme --- tests/t_hex.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tests/t_hex.c') diff --git a/tests/t_hex.c b/tests/t_hex.c index 7cce8ac..a761737 100644 --- a/tests/t_hex.c +++ b/tests/t_hex.c @@ -18,7 +18,7 @@ static void case_encode(void) { test_case("a hash encodes to forty upper case digits and a terminator"); memset(dest, 0x7f, sizeof(dest)); - CHECK_PTR(hex_fromhash(dest, sample), dest); + CHECK_PTR(hex_from_hash(dest, sample), dest); CHECK_STR(dest, "000123456789ABCDEFFF10203040506070809" "0A0"); CHECK_INT(strlen(dest), 40); CHECK_INT((unsigned char)dest[41], 0x7f); @@ -28,7 +28,7 @@ static void case_decode(void) { ot_hash hash; test_case("forty digits decode back to the hash"); - CHECK(hex_tohash(hash, "000123456789ABCDEFFF10203040506070809" "0A0")); + CHECK(hex_to_hash(hash, "000123456789ABCDEFFF10203040506070809" "0A0")); CHECK_MEM(hash, sample, sizeof(sample)); } @@ -41,8 +41,8 @@ static void case_round_trip(void) { for (i = 0; i < 256; ++i) { uint8_t probe[20]; memset(probe, (uint8_t)i, sizeof(probe)); - hex_fromhash(text, probe); - if (!hex_tohash(hash, text) || memcmp(hash, probe, sizeof(probe))) { + hex_from_hash(text, probe); + if (!hex_to_hash(hash, text) || memcmp(hash, probe, sizeof(probe))) { test_failf(__FILE__, __LINE__, "round trip failed for byte value %zu", i); return; } @@ -54,8 +54,8 @@ static void case_decode_is_case_insensitive(void) { ot_hash upper, lower; test_case("lower case digits decode the same as upper case"); - CHECK(hex_tohash(upper, "ABCDEF0123456789ABCDEF0123456789ABCDEF01")); - CHECK(hex_tohash(lower, "abcdef0123456789abcdef0123456789abcdef01")); + CHECK(hex_to_hash(upper, "ABCDEF0123456789ABCDEF0123456789ABCDEF01")); + CHECK(hex_to_hash(lower, "abcdef0123456789abcdef0123456789abcdef01")); CHECK_MEM(lower, upper, sizeof(ot_hash)); } @@ -63,18 +63,18 @@ static void case_rejects_non_digits(void) { ot_hash hash; test_case("a non hex character anywhere rejects the whole string"); - CHECK_INT(hex_tohash(hash, "g00123456789ABCDEFFF102030405060708090A0"), 0); - CHECK_INT(hex_tohash(hash, "000123456789ABCDEFFF102030405060708090Ag"), 0); - CHECK_INT(hex_tohash(hash, "000123456789ABCDEF:F102030405060708090A"), 0); + CHECK_INT(hex_to_hash(hash, "g00123456789ABCDEFFF102030405060708090A0"), 0); + CHECK_INT(hex_to_hash(hash, "000123456789ABCDEFFF102030405060708090Ag"), 0); + CHECK_INT(hex_to_hash(hash, "000123456789ABCDEF:F102030405060708090A"), 0); } static void case_rejects_short_input(void) { ot_hash hash; test_case("a string shorter than forty digits is rejected"); - CHECK_INT(hex_tohash(hash, ""), 0); - CHECK_INT(hex_tohash(hash, "00"), 0); - CHECK_INT(hex_tohash(hash, "000123456789ABCDEFFF102030405060708090A"), 0); + CHECK_INT(hex_to_hash(hash, ""), 0); + CHECK_INT(hex_to_hash(hash, "00"), 0); + CHECK_INT(hex_to_hash(hash, "000123456789ABCDEFFF102030405060708090A"), 0); } static void case_leaves_hash_untouched_on_failure(void) { @@ -82,7 +82,7 @@ static void case_leaves_hash_untouched_on_failure(void) { test_case("a rejected string leaves the destination untouched"); memset(hash, 0x5a, sizeof(hash)); - CHECK_INT(hex_tohash(hash, "000123456789ABCDEFFF10203040506070809XX0"), 0); + CHECK_INT(hex_to_hash(hash, "000123456789ABCDEFFF10203040506070809XX0"), 0); CHECK_MEM(hash, "\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a\x5a", sizeof(hash)); } @@ -96,7 +96,7 @@ static void case_stops_at_the_terminator(void) { memcpy(guarded, "0012", 4); guarded[4] = 0; memset(guarded + 5, 'f', 3); - CHECK_INT(hex_tohash(hash, guarded), 0); + CHECK_INT(hex_to_hash(hash, guarded), 0); } static void case_isdigit(void) { -- cgit v1.3