diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:36:42 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-01-28 12:36:42 -0500 |
| commit | e5ea02a662450ded7fcfcf31e8cd0ec0ec421ed5 (patch) | |
| tree | 78186027ec850102a6ff8d95233f00a241131761 | |
| parent | c36c6b50575cc0db94e6e770f5b4d437c851ff59 (diff) | |
| parent | f3da5f88d73f20ba1d28dde973c41e4ec45a02b6 (diff) | |
| download | tor-e5ea02a662450ded7fcfcf31e8cd0ec0ec421ed5.tar.gz tor-e5ea02a662450ded7fcfcf31e8cd0ec0ec421ed5.zip | |
Merge branch 'maint-0.4.3' into release-0.4.3
| -rw-r--r-- | changes/bug40210 | 5 | ||||
| -rw-r--r-- | src/ext/keccak-tiny/keccak-tiny.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug40210 b/changes/bug40210 new file mode 100644 index 0000000000..f492262a11 --- /dev/null +++ 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 index a9c8ed6420..dd26386a9a 100644 --- 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); |