From 933f9caeeb2b3c1b951d330e04beb04226e5a890 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Mon, 16 Nov 2015 23:17:52 +0100 Subject: siphash24: let siphash24_finalize() and siphash24() return the result directly Rather than passing a pointer to return the result, return it directly from the function calls. Also, return the result in native endianess, and let the callers care about the conversion. For hash tables and bloom filters, we don't care, but in order to keep MAC addresses and DHCP client IDs stable, we explicitly convert to LE. --- src/basic/siphash24.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/basic/siphash24.c') diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c index d7640d395d..b6b6172f60 100644 --- a/src/basic/siphash24.c +++ b/src/basic/siphash24.c @@ -141,7 +141,7 @@ void siphash24_compress(const void *_in, size_t inlen, struct siphash *state) { } } -void siphash24_finalize(uint64_t *out, struct siphash *state) { +uint64_t siphash24_finalize(struct siphash *state) { uint64_t b; b = state->padding | (( ( uint64_t )state->inlen ) << 56); @@ -170,14 +170,15 @@ void siphash24_finalize(uint64_t *out, struct siphash *state) { sipround(state); sipround(state); - *(le64_t*)out = htole64(state->v0 ^ state->v1 ^ state->v2 ^ state->v3); + return state->v0 ^ state->v1 ^ state->v2 ^ state->v3; } /* SipHash-2-4 */ -void siphash24(uint64_t *out, const void *_in, size_t inlen, const uint8_t k[16]) { +uint64_t siphash24(const void *_in, size_t inlen, const uint8_t k[16]) { struct siphash state; siphash24_init(&state, k); siphash24_compress(_in, inlen, &state); - siphash24_finalize(out, &state); + + return siphash24_finalize(&state); } -- cgit v1.2.3-54-g00ecf