siphash24: unify API

Make the API of the new helpers more similar to the old wrapper.

In particular we now return the hash as a byte string to avoid
any endianness problems.

1 files changed, 8 insertions, 16 deletions

diff --git a/src/test/test-siphash24.c b/src/test/test-siphash24.c
index 65eb2b6f35..2402da6a6f 100644
--- a/src/test/test-siphash24.c
+++ b/src/test/test-siphash24.c
@@ -32,23 +32,13 @@ int main(int argc, char *argv[]) {
         const uint8_t key[16] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                                   0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f};
         uint64_t out = 0;
-        unsigned i, j, k;
-        usec_t ts;
+        unsigned i, j;
 
         siphash24((uint8_t *)&out, in, sizeof(in), key);
-        assert_se(out == 0xa129ca6149be45e5);
-
-        assert_se(out == 0xa129ca6149be45e5ULL);
-
-        ts = now(CLOCK_MONOTONIC);
-        for (k = 0; k < ITERATIONS; k++)
-                siphash24((uint8_t *)&out, in, sizeof(in), key);
-        ts = now(CLOCK_MONOTONIC) - ts;
-
-        log_info("%llu iterations per second", (ITERATIONS * USEC_PER_SEC) / ts);
+        assert_se(out == htole64(0xa129ca6149be45e5));
 
         /* verify the internal state as given in the above paper */
-        siphash_init(&state, key);
+        siphash24_init(&state, key);
         assert_se(state.v0 == 0x7469686173716475);
         assert_se(state.v1 == 0x6b617f6d656e6665);
         assert_se(state.v2 == 0x6b7f62616d677361);
@@ -58,7 +48,8 @@ int main(int argc, char *argv[]) {
         assert_se(state.v1 == 0x0d52f6f62a4f59a4);
         assert_se(state.v2 == 0x634cb3577b01fd3d);
         assert_se(state.v3 == 0xa5224d6f55c7d9c8);
-        assert_se(siphash24_finalize(&state) == 0xa129ca6149be45e5);
+        siphash24_finalize((uint8_t*)&out, &state);
+        assert_se(out == htole64(0xa129ca6149be45e5));
         assert_se(state.v0 == 0xf6bcd53893fecff1);
         assert_se(state.v1 == 0x54b9964c7ea0d937);
         assert_se(state.v2 == 0x1b38329c099bb55a);
@@ -68,11 +59,12 @@ int main(int argc, char *argv[]) {
            same result */
         for (i = 0; i < sizeof(in); i++) {
                 for (j = i; j < sizeof(in); j++) {
-                        siphash_init(&state, key);
+                        siphash24_init(&state, key);
                         siphash24_compress(in, i, &state);
                         siphash24_compress(&in[i], j - i, &state);
                         siphash24_compress(&in[j], sizeof(in) - j, &state);
-                        assert_se(siphash24_finalize(&state) == 0xa129ca6149be45e5);
+                        siphash24_finalize((uint8_t*)&out, &state);
+                        assert_se(out == htole64(0xa129ca6149be45e5));
                 }
         }
 }