contrib: remove deprecated Murmurhash3

Knot.files

@@ -40,8 +40,6 @@ src/contrib/lmdb/midl.h
 src/contrib/macros.h
 src/contrib/mempattern.c
 src/contrib/mempattern.h
-src/contrib/murmurhash3/murmurhash3.c
-src/contrib/murmurhash3/murmurhash3.h
 src/contrib/net.c
 src/contrib/net.h
 src/contrib/openbsd/siphash.c

src/Makefile.am

@@ -28,10 +28,8 @@ EXTRA_DIST =					\
 	contrib/licenses/0BSD			\
 	contrib/licenses/BSD-3-Clause		\
 	contrib/licenses/LGPL-2.0		\
-	contrib/licenses/MIT			\
 	contrib/licenses/OLDAP-2.8		\
 	contrib/lmdb/LICENSE			\
-	contrib/murmurhash3/LICENSE		\
 	contrib/openbsd/LICENSE			\
 	contrib/ucw/LICENSE			\
 	utils/pykeymgr/pykeymgr.in
@@ -75,8 +73,6 @@ libcontrib_la_SOURCES = 			\
 	contrib/trim.h				\
 	contrib/wire.h				\
 	contrib/wire_ctx.h			\
-	contrib/murmurhash3/murmurhash3.c	\
-	contrib/murmurhash3/murmurhash3.h	\
 	contrib/openbsd/siphash.c		\
 	contrib/openbsd/siphash.h		\
 	contrib/openbsd/strlcat.c		\

src/contrib/licenses/MIT

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

src/contrib/murmurhash3/LICENSE

-../licenses/MIT
\ No newline at end of file

src/contrib/murmurhash3/murmurhash3.c

-/*
- * This is MurmurHash3. The original C++ code was placed in the public domain
- * by its author, Austin Appleby.
- */
-
-#include <string.h>
-#include "contrib/murmurhash3/murmurhash3.h"
-
-static inline uint32_t fmix(uint32_t h)
-{
-    h ^= h >> 16;
-    h *= 0x85ebca6b;
-    h ^= h >> 13;
-    h *= 0xc2b2ae35;
-    h ^= h >> 16;
-
-    return h;
-}
-
-static inline uint32_t rotl32(uint32_t x, int8_t r)
-{
-    return (x << r) | (x >> (32 - r));
-}
-
-uint32_t hash(const char* data, size_t len_)
-{
-    const int len = (int) len_;
-    const int nblocks = len / sizeof(uint32_t);
-
-    uint32_t h1 = 0xc062fb4a;
-
-    uint32_t c1 = 0xcc9e2d51;
-    uint32_t c2 = 0x1b873593;
-
-    //----------
-    // body
-
-    for(int i = 0; i < nblocks; i++)
-    {
-        uint32_t k1;
-        memcpy(&k1, data + (i * sizeof(uint32_t)), sizeof(uint32_t));
-
-        k1 *= c1;
-        k1 = rotl32(k1, 15);
-        k1 *= c2;
-
-        h1 ^= k1;
-        h1 = rotl32(h1, 13);
-        h1 = h1*5+0xe6546b64;
-    }
-
-    //----------
-    // tail
-
-    const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
-
-    uint32_t k1 = 0;
-
-    switch(len & 3)
-    {
-        case 3: k1 ^= tail[2] << 16;
-        case 2: k1 ^= tail[1] << 8;
-        case 1: k1 ^= tail[0];
-              k1 *= c1; k1 = rotl32(k1,15); k1 *= c2; h1 ^= k1;
-    }
-
-    //----------
-    // finalization
-
-    h1 ^= len;
-
-    h1 = fmix(h1);
-
-    return h1;
-}

src/contrib/murmurhash3/murmurhash3.h

-/*
- * This is MurmurHash3. The original C++ code was placed in the public domain
- * by its author, Austin Appleby.
- */
-
-#pragma once
-
-#include <stdlib.h>
-#include <stdint.h>
-
-uint32_t hash(const char* data, size_t len);