From 91307842b8792afba8c26044ff9ae703fe85b6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 9 Jan 2019 14:34:36 +0100 Subject: [PATCH] Add reference SipHash 2-4 implementation (cherry picked from commit a197df137af828012c7a471a7aa79465f8245a32) (cherry picked from commit 8d87ad53eb0ea11c15b72eeaf95ad2344759e0a7) --- lib/isc/Makefile.in | 4 +- lib/isc/include/isc/Makefile.in | 2 +- lib/isc/include/isc/siphash.h | 31 ++++++ lib/isc/siphash.c | 135 ++++++++++++++++++++++++ lib/isc/win32/libisc.def.in | 1 + lib/isc/win32/libisc.vcxproj.filters.in | 5 + lib/isc/win32/libisc.vcxproj.in | 3 + util/copyrights | 3 + 8 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 lib/isc/include/isc/siphash.h create mode 100644 lib/isc/siphash.c diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index ba53ef1091..0fd08379ae 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -60,7 +60,7 @@ OBJS = @ISC_EXTRA_OBJS@ @ISC_PK11_O@ @ISC_PK11_RESULT_O@ \ parseint.@O@ portset.@O@ quota.@O@ radix.@O@ random.@O@ \ ratelimiter.@O@ refcount.@O@ region.@O@ regex.@O@ result.@O@ \ rwlock.@O@ \ - safe.@O@ serial.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \ + safe.@O@ serial.@O@ siphash.@O@ sha1.@O@ sha2.@O@ sockaddr.@O@ stats.@O@ \ string.@O@ strtoul.@O@ symtab.@O@ task.@O@ taskpool.@O@ \ tm.@O@ timer.@O@ version.@O@ \ ${UNIXOBJS} ${NLSOBJS} ${THREADOBJS} @@ -79,7 +79,7 @@ SRCS = @ISC_EXTRA_SRCS@ @ISC_PK11_C@ @ISC_PK11_RESULT_C@ \ netaddr.c netscope.c pool.c ondestroy.c \ parseint.c portset.c quota.c radix.c random.c ${CHACHASRCS} \ ratelimiter.c refcount.c region.c regex.c result.c rwlock.c \ - safe.c serial.c sha1.c sha2.c sockaddr.c stats.c string.c \ + safe.c serial.c siphash.c sha1.c sha2.c sockaddr.c stats.c string.c \ strtoul.c symtab.c task.c taskpool.c timer.c \ tm.c version.c diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index 9f1af834c4..46dfd39d9f 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -30,7 +30,7 @@ HEADERS = aes.h app.h assertions.h boolean.h backtrace.h base32.h base64.h \ parseint.h pool.h portset.h print.h queue.h quota.h \ radix.h random.h ratelimiter.h refcount.h regex.h \ region.h resource.h result.h resultclass.h rwlock.h \ - safe.h serial.h sha1.h sha2.h sockaddr.h socket.h \ + safe.h serial.h siphash.h sha1.h sha2.h sockaddr.h socket.h \ stats.h stdio.h stdlib.h string.h symtab.h task.h \ taskpool.h timer.h tm.h types.h util.h version.h \ xml.h diff --git a/lib/isc/include/isc/siphash.h b/lib/isc/include/isc/siphash.h new file mode 100644 index 0000000000..472e8f2253 --- /dev/null +++ b/lib/isc/include/isc/siphash.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + + +/*! \file isc/siphash.h */ + +#pragma once + +#include +#include +#include + +#define ISC_SIPHASH24_KEY_LENGTH 128 / 8 +#define ISC_SIPHASH24_TAG_LENGTH 64 / 8 + +ISC_LANG_BEGINDECLS + +void +isc_siphash24(const uint8_t *key, + const uint8_t *in, size_t inlen, + uint8_t *out); + +ISC_LANG_ENDDECLS diff --git a/lib/isc/siphash.c b/lib/isc/siphash.c new file mode 100644 index 0000000000..455ac4faf5 --- /dev/null +++ b/lib/isc/siphash.c @@ -0,0 +1,135 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +/* + siphash() function is 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 . + */ + +/*! \file isc/siphash.c */ + +#include + +#include +#include +#include + +#include +#include +#include + +#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) + +#define HALF_ROUND(a, b, c, d, s, t) \ + a += b; c += d; \ + b = ROTATE(b, s) ^ a; \ + d = ROTATE(d, t) ^ c; \ + a = ROTATE(a, 32); + +#define FULL_ROUND(v0, v1, v2, v3) \ + HALF_ROUND(v0, v1, v2, v3, 13, 16); \ + HALF_ROUND(v2, v1, v0, v3, 17, 21); + +#define DOUBLE_ROUND(v0, v1, v2, v3) \ + FULL_ROUND(v0, v1, v2, v3) \ + FULL_ROUND(v0, v1, v2, v3) + +#define SIPROUND FULL_ROUND + +void +isc_siphash24(const uint8_t *k, const uint8_t *in, size_t inlen, uint8_t *out) +{ + const uint64_t *key = (const uint64_t *)k; + uint64_t k0 = le64toh(key[0]); + uint64_t k1 = le64toh(key[1]); + + uint64_t v0 = 0x736f6d6570736575ULL ^ k0; + uint64_t v1 = 0x646f72616e646f6dULL ^ k1; + uint64_t v2 = 0x6c7967656e657261ULL ^ k0; + uint64_t v3 = 0x7465646279746573ULL ^ k1; + + size_t left = inlen; + + uint64_t b = ((uint64_t)inlen) << 56; + + const uint64_t *inbuf = (const uint64_t *)in; + while (left >= 8) { + uint64_t m = le64toh(*inbuf); + + v3 ^= m; + + SIPROUND(v0, v1, v2, v3); + SIPROUND(v0, v1, v2, v3); + + v0 ^= m; + + inbuf++; left -= 8; + } + + const uint8_t *end = in + (inlen - left); + + switch (left) { + case 7: + b |= ((uint64_t)end[6]) << 48; + /* FALLTHROUGH */ + case 6: + b |= ((uint64_t)end[5]) << 40; + /* FALLTHROUGH */ + case 5: + b |= ((uint64_t)end[4]) << 32; + /* FALLTHROUGH */ + case 4: + b |= ((uint64_t)end[3]) << 24; + /* FALLTHROUGH */ + case 3: + b |= ((uint64_t)end[2]) << 16; + /* FALLTHROUGH */ + case 2: + b |= ((uint64_t)end[1]) << 8; + /* FALLTHROUGH */ + case 1: + b |= ((uint64_t)end[0]); + /* FALLTHROUGH */ + case 0: + break; + default: + INSIST(0); + ISC_UNREACHABLE(); + } + + v3 ^= b; + + SIPROUND(v0, v1, v2, v3); + SIPROUND(v0, v1, v2, v3); + + v0 ^= b; + + v2 ^= 0xff; + + SIPROUND(v0, v1, v2, v3); + SIPROUND(v0, v1, v2, v3); + SIPROUND(v0, v1, v2, v3); + SIPROUND(v0, v1, v2, v3); + + b = v0 ^ v1 ^ v2 ^ v3; + + uint64_t *outbuf = (uint64_t *)out; + *outbuf = htole64(b); +} diff --git a/lib/isc/win32/libisc.def.in b/lib/isc/win32/libisc.def.in index 7b9f23d776..fb48fbfadf 100644 --- a/lib/isc/win32/libisc.def.in +++ b/lib/isc/win32/libisc.def.in @@ -605,6 +605,7 @@ isc_sha512_final isc_sha512_init isc_sha512_invalidate isc_sha512_update +isc_siphash24 isc_sockaddr_any isc_sockaddr_any6 isc_sockaddr_anyofpf diff --git a/lib/isc/win32/libisc.vcxproj.filters.in b/lib/isc/win32/libisc.vcxproj.filters.in index d6a52341eb..5fc1cf1610 100644 --- a/lib/isc/win32/libisc.vcxproj.filters.in +++ b/lib/isc/win32/libisc.vcxproj.filters.in @@ -67,6 +67,9 @@ Library Header Files + + Library Header Files + Library Header Files @@ -233,6 +236,7 @@ Library Header Files + Library Header Files @@ -637,6 +641,7 @@ Library Source Files + Library Source Files diff --git a/lib/isc/win32/libisc.vcxproj.in b/lib/isc/win32/libisc.vcxproj.in index bb0456ff5a..0cd79fdfd0 100644 --- a/lib/isc/win32/libisc.vcxproj.in +++ b/lib/isc/win32/libisc.vcxproj.in @@ -312,6 +312,7 @@ copy InstallFiles ..\Build\Release\ + @@ -368,6 +369,7 @@ copy InstallFiles ..\Build\Release\ + @@ -481,6 +483,7 @@ copy InstallFiles ..\Build\Release\ + diff --git a/util/copyrights b/util/copyrights index cb7a235c2a..d66ddddba2 100644 --- a/util/copyrights +++ b/util/copyrights @@ -3920,6 +3920,7 @@ ./lib/isc/include/isc/crc64.h C 2013,2016,2018,2019 ./lib/isc/include/isc/deprecated.h C 2017,2018,2019 ./lib/isc/include/isc/entropy.h C 2000,2001,2004,2005,2006,2007,2009,2016,2018,2019 +./lib/isc/include/isc/endian.h C 2019 ./lib/isc/include/isc/errno.h C 2016,2018,2019 ./lib/isc/include/isc/error.h C 1998,1999,2000,2001,2004,2005,2006,2007,2009,2016,2017,2018,2019 ./lib/isc/include/isc/event.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2014,2016,2017,2018,2019 @@ -3978,6 +3979,7 @@ ./lib/isc/include/isc/serial.h C 1999,2000,2001,2004,2005,2006,2007,2009,2016,2018,2019 ./lib/isc/include/isc/sha1.h C 2000,2001,2004,2005,2006,2007,2009,2014,2016,2017,2018,2019 ./lib/isc/include/isc/sha2.h C 2005,2006,2007,2009,2014,2016,2017,2018,2019 +./lib/isc/include/isc/siphash.h C 2019 ./lib/isc/include/isc/sockaddr.h C 1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2009,2012,2015,2016,2018,2019 ./lib/isc/include/isc/socket.h C 1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2016,2018,2019 ./lib/isc/include/isc/stats.h C 2009,2012,2016,2018,2019 @@ -4073,6 +4075,7 @@ ./lib/isc/serial.c C 1999,2000,2001,2004,2005,2007,2016,2018,2019 ./lib/isc/sha1.c C 2000,2001,2003,2004,2005,2007,2009,2011,2012,2014,2016,2017,2018,2019 ./lib/isc/sha2.c C 2005,2006,2007,2009,2011,2012,2014,2016,2017,2018,2019 +./lib/isc/siphash.c C 2019 ./lib/isc/sockaddr.c C 1999,2000,2001,2002,2003,2004,2005,2006,2007,2010,2011,2012,2014,2015,2016,2017,2018,2019 ./lib/isc/socket_api.c C 2009,2011,2012,2013,2014,2015,2016,2018,2019 ./lib/isc/sparc64/Makefile.in MAKE 2007,2012,2016,2018,2019