diff options
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2017-12-09-11-03-51.bpo-32260.1DAO-p.rst | 3 | ||||
| -rw-r--r-- | Python/pyhash.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-12-09-11-03-51.bpo-32260.1DAO-p.rst b/Misc/NEWS.d/next/Core and Builtins/2017-12-09-11-03-51.bpo-32260.1DAO-p.rst new file mode 100644 index 0000000..523ffe0 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2017-12-09-11-03-51.bpo-32260.1DAO-p.rst @@ -0,0 +1,3 @@ +Don't byte swap the input keys to the SipHash algorithm on big-endian +platforms. This should ensure siphash gives consistent results across +platforms. diff --git a/Python/pyhash.c b/Python/pyhash.c index bc6786c..4494a2f 100644 --- a/Python/pyhash.c +++ b/Python/pyhash.c @@ -364,9 +364,7 @@ static PyHash_FuncDef PyHash_Func = {fnv, "fnv", 8 * SIZEOF_PY_HASH_T, static uint64_t -siphash24(uint64_t key0, uint64_t key1, const void *src, Py_ssize_t src_sz) { - uint64_t k0 = _le64toh(key0); - uint64_t k1 = _le64toh(key1); +siphash24(uint64_t k0, uint64_t k1, const void *src, Py_ssize_t src_sz) { uint64_t b = (uint64_t)src_sz << 56; const uint64_t *in = (uint64_t*)src; |