commit f3da5f88d73f20ba1d28dde973c41e4ec45a02b6 parent dd5fbc1bd9d54d191240ac4e15b5324fb83a903d Author: David Goulet <dgoulet@torproject.org> Date: Thu, 28 Jan 2021 12:36:42 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 Diffstat:
| A | changes/bug40210 | | | 5 | +++++ |
| M | src/ext/keccak-tiny/keccak-tiny.h | | | 2 | +- |
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug40210 b/changes/bug40210 @@ -0,0 +1,5 @@ + o Minor features (crypto): + - Fix undefined behavior on our Keccak library. The bug only appears on + platforms with 32-byte CPU cache lines (e.g. armv5tel) and would result + in wrong digests. Fixes bug 40210; bugfix on 0.2.8.1-alpha. Thanks to + Bernhard Übelacker, Arnd Bergmann and weasel for diagnosing this. diff --git a/src/ext/keccak-tiny/keccak-tiny.h b/src/ext/keccak-tiny/keccak-tiny.h @@ -21,7 +21,7 @@ typedef struct keccak_state { size_t offset; uint8_t finalized : 1; -} keccak_state; +} __attribute__((aligned(8))) keccak_state; /* Initialize a Keccak instance suitable for SHA-3 hash functions. */ int keccak_digest_init(keccak_state *s, size_t bits);