aboutsummaryrefslogtreecommitdiff
path: root/siphash.c
diff options
context:
space:
mode:
authorJP Aumasson <jpa@pm.me>2021-01-19 18:52:52 +0100
committerJP Aumasson <jpa@pm.me>2021-01-19 18:52:52 +0100
commit030cb8c42ca081ba2e0d5386ec6a2b08b264e991 (patch)
tree2f6fa8a895da69d6a6dd42918dec84a63d7294f3 /siphash.c
parentMerge pull request #30 from veorq/notahash (diff)
downloadsiphash-030cb8c42ca081ba2e0d5386ec6a2b08b264e991.tar.gz
siphash-030cb8c42ca081ba2e0d5386ec6a2b08b264e991.tar.xz
header
Diffstat (limited to 'siphash.c')
-rw-r--r--siphash.c65
1 files changed, 3 insertions, 62 deletions
diff --git a/siphash.c b/siphash.c
index 71d85de..3aba392 100644
--- a/siphash.c
+++ b/siphash.c
@@ -1,7 +1,7 @@
/*
SipHash reference C implementation
- Copyright (c) 2012-2016 Jean-Philippe Aumasson
+ Copyright (c) 2012-2021 Jean-Philippe Aumasson
<jeanphilippe.aumasson@gmail.com>
Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
@@ -14,67 +14,8 @@
this software. If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.
*/
-#include <assert.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-/* 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
+#include "siphash.h"
+
int siphash(const uint8_t *in, const size_t inlen, const uint8_t *k,
uint8_t *out, const size_t outlen) {