]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
closes bpo-40184: Only define pysiphash if the hash algorithm is SIPHASH24. (GH-19369)
authorBatuhan Taşkaya <batuhanosmantaskaya@gmail.com>
Sat, 4 Apr 2020 21:25:12 +0000 (00:25 +0300)
committerGitHub <noreply@github.com>
Sat, 4 Apr 2020 21:25:12 +0000 (16:25 -0500)
Python/pyhash.c

index faac730d79dee77c02f950a0bab09c56deef9fa0..a6f42e71cf643c0b7e4971504e541d2a57df9e31 100644 (file)
@@ -412,13 +412,6 @@ siphash24(uint64_t k0, uint64_t k1, const void *src, Py_ssize_t src_sz) {
     return t;
 }
 
-static Py_hash_t
-pysiphash(const void *src, Py_ssize_t src_sz) {
-    return (Py_hash_t)siphash24(
-        _le64toh(_Py_HashSecret.siphash.k0), _le64toh(_Py_HashSecret.siphash.k1),
-        src, src_sz);
-}
-
 uint64_t
 _Py_KeyedHash(uint64_t key, const void *src, Py_ssize_t src_sz)
 {
@@ -427,6 +420,13 @@ _Py_KeyedHash(uint64_t key, const void *src, Py_ssize_t src_sz)
 
 
 #if Py_HASH_ALGORITHM == Py_HASH_SIPHASH24
+static Py_hash_t
+pysiphash(const void *src, Py_ssize_t src_sz) {
+    return (Py_hash_t)siphash24(
+        _le64toh(_Py_HashSecret.siphash.k0), _le64toh(_Py_HashSecret.siphash.k1),
+        src, src_sz);
+}
+
 static PyHash_FuncDef PyHash_Func = {pysiphash, "siphash24", 64, 128};
 #endif