From b738aa424202bc1ecc922a6f5bd34dc21e2617cd Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 3 Jul 2020 10:03:53 +0000 Subject: [PATCH] try to debug siphash --- mio/bin/t05.c | 171 +++++++++++++++++++++++++++++++++++++++++++++ mio/lib/utl-siph.c | 14 ++-- 2 files changed, 178 insertions(+), 7 deletions(-) diff --git a/mio/bin/t05.c b/mio/bin/t05.c index e944bf3..9b28a86 100644 --- a/mio/bin/t05.c +++ b/mio/bin/t05.c @@ -4,6 +4,176 @@ /* https://131002.net/siphash/siphash24.c */ + + + +/* + SipHash reference C implementation + + Copyright (c) 2012-2016 Jean-Philippe Aumasson + + Copyright (c) 2012-2014 Daniel J. Bernstein + + To the extent possible under law, the author(s) have dedicated all copyright + and related and neighboring rights to this software to the public domain + worldwide. This software is distributed without any warranty. + + You should have received a copy of the CC0 Public Domain Dedication along + with + this software. If not, see + . + */ +#include +#include +#include +#include +#include + +/* default: SipHash-2-4 */ +#ifndef cROUNDS + #define cROUNDS 2 +#endif +#ifndef dROUNDS + #define dROUNDS 4 +#endif + +#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b)))) + +#define U32TO8_LE(p, v) \ + (p)[0] = (uint8_t)((v)); \ + (p)[1] = (uint8_t)((v) >> 8); \ + (p)[2] = (uint8_t)((v) >> 16); \ + (p)[3] = (uint8_t)((v) >> 24); + +#define U64TO8_LE(p, v) \ + U32TO8_LE((p), (uint32_t)((v))); \ + U32TO8_LE((p) + 4, (uint32_t)((v) >> 32)); + +#define U8TO64_LE(p) \ + (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) | \ + ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) | \ + ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) | \ + ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56)) + +#define SIPROUND \ + do { \ + v0 += v1; \ + v1 = ROTL(v1, 13); \ + v1 ^= v0; \ + v0 = ROTL(v0, 32); \ + v2 += v3; \ + v3 = ROTL(v3, 16); \ + v3 ^= v2; \ + v0 += v3; \ + v3 = ROTL(v3, 21); \ + v3 ^= v0; \ + v2 += v1; \ + v1 = ROTL(v1, 17); \ + v1 ^= v2; \ + v2 = ROTL(v2, 32); \ + } while (0) + +#ifdef DEBUG +#define TRACE \ + do { \ + printf("(%3zu) v0 %016"PRIx64"\n", inlen, v0); \ + printf("(%3zu) v1 %016"PRIx64"\n", inlen, v1); \ + printf("(%3zu) v2 %016"PRIx64"\n", inlen, v2); \ + printf("(%3zu) v3 %016"PRIx64"\n", inlen, v3); \ + } while (0) +#else +#define TRACE +#endif + +int siphash(const uint8_t *in, const size_t inlen, const uint8_t *k, + uint8_t *out, const size_t outlen) { + + assert((outlen == 8) || (outlen == 16)); + uint64_t v0 = UINT64_C(0x736f6d6570736575); + uint64_t v1 = UINT64_C(0x646f72616e646f6d); + uint64_t v2 = UINT64_C(0x6c7967656e657261); + uint64_t v3 = UINT64_C(0x7465646279746573); + uint64_t k0 = U8TO64_LE(k); + uint64_t k1 = U8TO64_LE(k + 8); + uint64_t m; + int i; + const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t)); + const int left = inlen & 7; + uint64_t b = ((uint64_t)inlen) << 56; + v3 ^= k1; + v2 ^= k0; + v1 ^= k1; + v0 ^= k0; + + if (outlen == 16) + v1 ^= 0xee; + + for (; in != end; in += 8) { + m = U8TO64_LE(in); + v3 ^= m; + + TRACE; + for (i = 0; i < cROUNDS; ++i) + SIPROUND; + + v0 ^= m; + } + + switch (left) { + case 7: + b |= ((uint64_t)in[6]) << 48; + case 6: + b |= ((uint64_t)in[5]) << 40; + case 5: + b |= ((uint64_t)in[4]) << 32; + case 4: + b |= ((uint64_t)in[3]) << 24; + case 3: + b |= ((uint64_t)in[2]) << 16; + case 2: + b |= ((uint64_t)in[1]) << 8; + case 1: + b |= ((uint64_t)in[0]); + break; + case 0: + break; + } + + v3 ^= b; + + TRACE; + for (i = 0; i < cROUNDS; ++i) + SIPROUND; + + v0 ^= b; + + if (outlen == 16) + v2 ^= 0xee; + else + v2 ^= 0xff; + + TRACE; + for (i = 0; i < dROUNDS; ++i) + SIPROUND; + + b = v0 ^ v1 ^ v2 ^ v3; + U64TO8_LE(out, b); + + if (outlen == 8) + return 0; + + v1 ^= 0xdd; + + TRACE; + for (i = 0; i < dROUNDS; ++i) + SIPROUND; + + b = v0 ^ v1 ^ v2 ^ v3; + U64TO8_LE(out + 8, b); + + return 0; +} + /* SipHash-2-4 output with k = 00 01 02 ... @@ -98,6 +268,7 @@ int test_vectors() { in[i] = i; mio_sip_hash_24(k, in, i, out); + // siphash(in, i, k, out, 8); if ( memcmp( out, vectors[i], 8 ) ) { diff --git a/mio/lib/utl-siph.c b/mio/lib/utl-siph.c index 643f960..271bbd9 100644 --- a/mio/lib/utl-siph.c +++ b/mio/lib/utl-siph.c @@ -161,7 +161,7 @@ void mio_sip_hash_24 (const mio_uint8_t key[16], mio_uint8_t *dptr, mio_oow_t dl for (; dptr != end; dptr += 8) { m = U8TO64_LE(dptr); - SIP_2_ROUND(m, v0, v1, v2, v3); + SIP_2_ROUND (m, v0, v1, v2, v3); } #if (MIO_SIZEOF_UINT64_T > 0) @@ -183,16 +183,16 @@ void mio_sip_hash_24 (const mio_uint8_t key[16], mio_uint8_t *dptr, mio_oow_t dl case 7: OR_BYTE (6); case 6: OR_BYTE (5); case 5: OR_BYTE (4); - case 4: OR_BYTE(3); - case 3: OR_BYTE(2); - case 2: OR_BYTE(1); - case 1: OR_BYTE(0); + case 4: OR_BYTE (3); + case 3: OR_BYTE (2); + case 2: OR_BYTE (1); + case 1: OR_BYTE (0); case 0: break; } - SIP_2_ROUND(last, v0, v1, v2, v3); + SIP_2_ROUND (last, v0, v1, v2, v3); - XOR64_INT(v2, 0xff); + XOR64_INT (v2, 0xff); SIP_COMPRESS (v0, v1, v2, v3); SIP_COMPRESS (v0, v1, v2, v3);