lib/isc/siphash.c: Get rid of duplicate block caused by bad rebase

This commit is contained in:
Ondřej Surý 2019-09-03 14:20:53 +02:00
parent 0d795ed907
commit 32eee57875

View file

@ -52,22 +52,6 @@ isc_siphash24(const uint8_t *k,
#else /* HAVE_OPENSSL_SIPHASH */
/*
* The fallback implementation is based on SipHash reference C implementation by
*
* Copyright (c) 2012-2016 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
* Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
*
* 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 <http://creativecommons.org/publicdomain/zero/1.0/>.
*/
#define cROUNDS 2
#define dROUNDS 4
/*
* The implementation is based on SipHash reference C implementation by
*