- For #762: More generic integration for siphash.c

diff --git a/util/data/msgparse.c b/util/data/msgparse.c
index 8ba005a8df73f337cf1a891f979174fa3dcff0cd..9f3afd5edd43b7ac480e07628b05c64e32cb3e54 100644 (file)
--- a/util/data/msgparse.c
+++ b/util/data/msgparse.c
@@ -43,6 +43,7 @@
 #include "util/data/dname.h"
 #include "util/data/packed_rrset.h"
 #include "util/netevent.h"
+#include "util/siphash.h"
 #include "util/storage/lookup3.h"
 #include "util/regional.h"
 #include "sldns/rrdef.h"
@@ -951,9 +952,6 @@ edns_opt_list_append_keepalive(struct edns_option** list, int msec,
                        data, region);
 }
 
-int siphash(const uint8_t *in, const size_t inlen,
-               const uint8_t *k, uint8_t *out, const size_t outlen);
-
 /** RFC 1982 comparison, uses unsigned integers, and tries to avoid
  * compiler optimization (eg. by avoiding a-b<0 comparisons),
  * this routine matches compare_serial(), for SOA serial number checks */

diff --git a/util/data/msgparse.h b/util/data/msgparse.h
index aebeb2a88b48335f9f1d6114c2b688ddc77b768a..74493b76e8bc9a2a291e086bbdaa8c61dc35343e 100644 (file)
--- a/util/data/msgparse.h
+++ b/util/data/msgparse.h
@@ -315,6 +315,8 @@ int skip_pkt_rrs(struct sldns_buffer* pkt, int num);
  *     initialised.
  * @param cfg: the configuration (with nsid value etc.)
  * @param c: commpoint to determine transport (if needed)
+ * @param repinfo: commreply to determine the client address
+ * @param now: current time
  * @param region: region to alloc results in (edns option contents)
  * @return: 0 on success, or an RCODE on error.
  *     RCODE formerr if OPT is badly formatted and so on.

diff --git a/util/siphash.c b/util/siphash.c
index a45307f66c7ff18bf8f97fe43c9ac985e73ce70f..25007a09e9d415604da174793e6a59d2c39865e0 100644 (file)
--- a/util/siphash.c
+++ b/util/siphash.c
@@ -14,10 +14,17 @@
    this software. If not, see
    <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
-#include <assert.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
+/**
+ * Edited slightly for integration in Unbound. Edits are noted with 'EDIT'.
+ */
+/** EDIT
+ * #include <assert.h>
+ * #include <stdint.h>
+ * #include <stdio.h>
+ * #include <string.h>
+ * Replaced the above includes with Unbound's config.h
+ */
+#include "config.h"
 
 /* default: SipHash-2-4 */
 #define cROUNDS 2
@@ -89,6 +96,9 @@ int siphash(const uint8_t *in, const size_t inlen, const uint8_t *k,
     const uint8_t *end = in + inlen - (inlen % sizeof(uint64_t));
     const int left = inlen & 7;
     uint64_t b = ((uint64_t)inlen) << 56;
+    /** EDIT
+     * The following assert moved here from the top for C90 compliance.
+     */
     assert((outlen == 8) || (outlen == 16));
     v3 ^= k1;
     v2 ^= k0;

diff --git a/util/siphash.h b/util/siphash.h
new file mode 100644 (file)
index 0000000..63da217
--- /dev/null
+++ b/util/siphash.h
@@ -0,0 +1,43 @@
+/*
+ * util/siphash.h - header for SipHash reference C implementation.
+ *
+ * Copyright (c) 2023, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/**
+ * \file
+ * Contains the SipHash reference C implementation.
+ */
+#ifndef UTIL_SIPHASH_H
+#define UTIL_SIPHASH_H
+int siphash(const uint8_t *in, const size_t inlen, const uint8_t *k,
+            uint8_t *out, const size_t outlen);
+#endif /* UTIL_SIPHASH_H */