January 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 02bd135cb188531e8a6ee95959d7fe1d7f9635a8 Merge: 1bdccc03a9 d89974c5c6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:35 2021 -0500 Merge branch 'tor-gitlab/mr/243' into maint-0.3.5 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 50ac9f9229adb91f2af15623c78cd1863061e00c Merge: c652740515 a3f2bc8f13 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit f3da5f88d73f20ba1d28dde973c41e4ec45a02b6 Merge: dd5fbc1bd9 02bd135cb1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 02bd135cb188531e8a6ee95959d7fe1d7f9635a8 Merge: 1bdccc03a9 d89974c5c6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:35 2021 -0500 Merge branch 'tor-gitlab/mr/243' into maint-0.3.5 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit a3f2bc8f13eaa0868192b80186710c0765f26c59 Merge: 2c4a2a93d3 f3da5f88d7 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 02bd135cb188531e8a6ee95959d7fe1d7f9635a8 Merge: 1bdccc03a9 d89974c5c6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:35 2021 -0500 Merge branch 'tor-gitlab/mr/243' into maint-0.3.5 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit a3f2bc8f13eaa0868192b80186710c0765f26c59 Merge: 2c4a2a93d3 f3da5f88d7 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.4' into maint-0.4.5
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 50ac9f9229adb91f2af15623c78cd1863061e00c Merge: c652740515 a3f2bc8f13 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:42 2021 -0500 Merge branch 'maint-0.4.4' into maint-0.4.5

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit 8549b66ba69ef5e1b43f26d5a45d872e44fb3068 Merge: 8cd696ca04 50ac9f9229 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 28 12:36:43 2021 -0500 Merge branch 'maint-0.4.5'

1 0

[tor/release-0.4.3] Fix Keccak undefined behavior on exotic platforms.
by dgoulet＠torproject.org 28 Jan '21

28 Jan '21

commit d89974c5c6bdb9083693638014106a41cb6d022d Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Dec 17 13:49:17 2020 +0200 Fix Keccak undefined behavior on exotic platforms. Bug reported and diagnosed in: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=975977 Fixes bug #40210. --- changes/bug40210 | 5 +++++ src/ext/keccak-tiny/keccak-tiny.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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);

1 0