From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 3 Sep 2019 12:20:53 +0000 (+0200)
Subject: lib/isc/siphash.c: Get rid of duplicate block caused by bad rebase
X-Git-Tag: v9.15.4~14^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=32eee57875f4e172a4579102e44b6eddd7ef0bb0;p=thirdparty%2Fbind9.git

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

diff --git a/lib/isc/siphash.c b/lib/isc/siphash.c
index 23fff751922..783ef69e3f2 100644
--- a/lib/isc/siphash.c
+++ b/lib/isc/siphash.c
@@ -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
  *