From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 5 May 2021 22:05:22 +0000 (-0700)
Subject: bpo-36515: Disable unaligned memory access in _sha3 on ARM (GH-25927)
X-Git-Tag: v3.10.0b2~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b2a45ff95a68acc8276b37678c98740a232f6d4;p=thirdparty%2FPython%2Fcpython.git

bpo-36515: Disable unaligned memory access in _sha3 on ARM (GH-25927)


Contributed-By: Matthias Klose

Automerge-Triggered-By: GH:tiran
(cherry picked from commit da5c808fb50d34bc2e180d9481706072f33025da)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
---

diff --git a/Misc/NEWS.d/next/Library/2021-05-05-11-44-49.bpo-36515.uOSa3q.rst b/Misc/NEWS.d/next/Library/2021-05-05-11-44-49.bpo-36515.uOSa3q.rst
new file mode 100644
index 000000000000..dd24474c2fde
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-05-05-11-44-49.bpo-36515.uOSa3q.rst
@@ -0,0 +1,2 @@
+The :mod:`hashlib` module no longer does unaligned memory accesses when
+compiled for ARM platforms.
diff --git a/Modules/_sha3/sha3module.c b/Modules/_sha3/sha3module.c
index aba7f6d4b45c..3974e0b6b47f 100644
--- a/Modules/_sha3/sha3module.c
+++ b/Modules/_sha3/sha3module.c
@@ -64,6 +64,11 @@
 #define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN
 #endif
 
+/* Prevent bus errors on platforms requiring aligned accesses such ARM. */
+#if HAVE_ALIGNED_REQUIRED && !defined(NO_MISALIGNED_ACCESSES)
+#define NO_MISALIGNED_ACCESSES
+#endif
+
 /* mangle names */
 #define KeccakF1600_FastLoop_Absorb _PySHA3_KeccakF1600_FastLoop_Absorb
 #define Keccak_HashFinal _PySHA3_Keccak_HashFinal