From 23f424433d7610c9a10c96afefb1193a6a681acc Mon Sep 17 00:00:00 2001
From: ffs Upstream <robot@adios2>
Date: Wed, 25 Oct 2023 14:45:03 -0400
Subject: [PATCH] ffs 2023-10-25 (6ba5b105)

Code extracted from:

    https://github.com/GTkorvo/ffs.git

at commit 6ba5b10561af555aa871294ccc0869acfc100e75 (master).

Upstream Shortlog
-----------------
---
 CMakeLists.txt                               |   2 +-
 ffs/output_dir/context_test_output.osx-3.bin | Bin 0 -> 16939 bytes
 ffs/output_dir/file_output.osx-v3.bin        | Bin 0 -> 14513 bytes
 ffs/output_dir/index_output.osx-v3.bin       | Bin 0 -> 16305 bytes
 fm/fm_formats.c                              |  18 +-
 fm/siphash.c                                 | 185 +++++++++++++++++++
 fm/siphash.h                                 |  22 +++
 7 files changed, 221 insertions(+), 6 deletions(-)
 create mode 100755 ffs/output_dir/context_test_output.osx-3.bin
 create mode 100755 ffs/output_dir/file_output.osx-v3.bin
 create mode 100755 ffs/output_dir/index_output.osx-v3.bin
 create mode 100644 fm/siphash.c
 create mode 100644 fm/siphash.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d8589f95e..28e78f5450 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ else()
 endif()
 
 set(FM_SRC_LIST
-   fm_formats.c fm_dump.c lookup3.c string_conversion.c fm_get.c xml.c
+   fm_formats.c fm_dump.c siphash.c string_conversion.c fm_get.c xml.c
    ${FM_SOCKET_IO} ${FFS_FILE_IO})
 foreach(FM_SRC ${FM_SRC_LIST})
   list(APPEND FM_MASTER_SRC_LIST fm/${FM_SRC} )
diff --git a/ffs/output_dir/context_test_output.osx-3.bin b/ffs/output_dir/context_test_output.osx-3.bin
new file mode 100755
index 0000000000000000000000000000000000000000..e741dd13a65ccd7285d8c12c0edc85e395b10e26
GIT binary patch
literal 16939
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
H4AcJ$<;@mV

literal 0
HcmV?d00001

diff --git a/ffs/output_dir/file_output.osx-v3.bin b/ffs/output_dir/file_output.osx-v3.bin
new file mode 100755
index 0000000000000000000000000000000000000000..a8326f1e2644a75c390b7c69f092627f67634618
GIT binary patch
literal 14513
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
ZVijX{xz)wAxw-iX?1DsoVLQPh@qcX3;!Xen

literal 0
HcmV?d00001

diff --git a/ffs/output_dir/index_output.osx-v3.bin b/ffs/output_dir/index_output.osx-v3.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1a6cbe01711e5d85023297ddde77941f0cfb6bf7
GIT binary patch
literal 16305
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

literal 0
HcmV?d00001

diff --git a/fm/fm_formats.c b/fm/fm_formats.c
index 83414a45a5..5a53fd64ed 100755
--- a/fm/fm_formats.c
+++ b/fm/fm_formats.c
@@ -1946,12 +1946,20 @@ register_data_format(FMContext context, FMStructDescList struct_list)
 
 INT4 FFS_self_server_IP_addr = 0;
 
-extern void hashlittle2( 
-  const void *key,       /* the key to hash */
-  size_t      length,    /* length of the key */
-  INT4   *pc,        /* IN: primary initval, OUT: primary hash */
-  INT4   *pb)        /* IN: secondary initval, OUT: secondary hash */;
+#include "siphash.h"
 
+static void hashlittle2( 
+  const void *data,       /* the data to hash */
+  size_t      length,    /* length of the data */
+  INT4   *pc,        /* IN: primary initval, OUT: primary hash */
+  INT4   *pb)
+{
+    static const uint64_t skey[2] = {0xECB8FF2F434B2FBB, 0xB4E298A99A71F723 };
+    INT4 output[2];
+    siphash(data, length, &skey, (uint8_t*) &output[0], sizeof(output));
+    *pc = output[0];
+    *pb = output[1];
+}
 
 extern void
 generate_format3_server_ID(server_ID_type *server_ID,
diff --git a/fm/siphash.c b/fm/siphash.c
new file mode 100644
index 0000000000..c6d16e2055
--- /dev/null
+++ b/fm/siphash.c
@@ -0,0 +1,185 @@
+/*
+   SipHash reference C implementation
+
+   Copyright (c) 2012-2022 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/>.
+ */
+
+#include "siphash.h"
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.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_SIPHASH
+#include <stdio.h>
+
+#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
+
+/*
+    Computes a SipHash value
+    *in: pointer to input data (read-only)
+    inlen: input data length in bytes (any size_t value)
+    *k: pointer to the key data (read-only), must be 16 bytes 
+    *out: pointer to output data (write-only), outlen bytes must be allocated
+    outlen: length of the output in bytes, must be 8 or 16
+*/
+int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
+            const size_t outlen) {
+
+    const unsigned char *ni = (const unsigned char *)in;
+    const unsigned char *kk = (const unsigned char *)k;
+
+    assert((outlen == 8) || (outlen == 16));
+    uint64_t v0 = UINT64_C(0x736f6d6570736575);
+    uint64_t v1 = UINT64_C(0x646f72616e646f6d);
+    uint64_t v2 = UINT64_C(0x6c7967656e657261);
+    uint64_t v3 = UINT64_C(0x7465646279746573);
+    uint64_t k0 = U8TO64_LE(kk);
+    uint64_t k1 = U8TO64_LE(kk + 8);
+    uint64_t m;
+    int i;
+    const unsigned char *end = ni + inlen - (inlen % sizeof(uint64_t));
+    const int left = inlen & 7;
+    uint64_t b = ((uint64_t)inlen) << 56;
+    v3 ^= k1;
+    v2 ^= k0;
+    v1 ^= k1;
+    v0 ^= k0;
+
+    if (outlen == 16)
+        v1 ^= 0xee;
+
+    for (; ni != end; ni += 8) {
+        m = U8TO64_LE(ni);
+        v3 ^= m;
+
+        TRACE;
+        for (i = 0; i < cROUNDS; ++i)
+            SIPROUND;
+
+        v0 ^= m;
+    }
+
+    switch (left) {
+    case 7:
+        b |= ((uint64_t)ni[6]) << 48;
+        /* FALLTHRU */
+    case 6:
+        b |= ((uint64_t)ni[5]) << 40;
+        /* FALLTHRU */
+    case 5:
+        b |= ((uint64_t)ni[4]) << 32;
+        /* FALLTHRU */
+    case 4:
+        b |= ((uint64_t)ni[3]) << 24;
+        /* FALLTHRU */
+    case 3:
+        b |= ((uint64_t)ni[2]) << 16;
+        /* FALLTHRU */
+    case 2:
+        b |= ((uint64_t)ni[1]) << 8;
+        /* FALLTHRU */
+    case 1:
+        b |= ((uint64_t)ni[0]);
+        break;
+    case 0:
+        break;
+    }
+
+    v3 ^= b;
+
+    TRACE;
+    for (i = 0; i < cROUNDS; ++i)
+        SIPROUND;
+
+    v0 ^= b;
+
+    if (outlen == 16)
+        v2 ^= 0xee;
+    else
+        v2 ^= 0xff;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out, b);
+
+    if (outlen == 8)
+        return 0;
+
+    v1 ^= 0xdd;
+
+    TRACE;
+    for (i = 0; i < dROUNDS; ++i)
+        SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out + 8, b);
+
+    return 0;
+}
diff --git a/fm/siphash.h b/fm/siphash.h
new file mode 100644
index 0000000000..3fbd378068
--- /dev/null
+++ b/fm/siphash.h
@@ -0,0 +1,22 @@
+/*
+   SipHash reference C implementation
+
+   Copyright (c) 2012-2021 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/>.
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+int siphash(const void *in, const size_t inlen, const void *k, uint8_t *out,
+            const size_t outlen);