February 2017 - tor-commits - lists.torproject.org

[tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 640b4022324c19cf330a26b8d42b6bf7707346ce Merge: 34fdd51 053e11f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:32:10 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit eb72365554451f5e129169bb1216a9610f7ff183 Merge: 8c91cbb 8936c50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:25 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7

1 0

[tor/release-0.2.8] Make memwipe() do nothing when passed a NULL pointer or zero size
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit fb7d1f41b409761be3381efaeec0f56d2a470a9f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Jan 19 11:22:58 2016 +1100 Make memwipe() do nothing when passed a NULL pointer or zero size Check size argument to memwipe() for underflow. Closes bug #18089. Reported by "gk", patch by "teor". Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), commit 49dd5ef3 on 7 Nov 2012. --- changes/bug18089 | 6 ++++++ src/common/crypto.c | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/bug18089 b/changes/bug18089 new file mode 100644 index 0000000..c1fb342 --- /dev/null +++ b/changes/bug18089 @@ -0,0 +1,6 @@ + o Minor fixes (security): + - Make memwipe() do nothing when passed a NULL pointer + or zero size. Check size argument to memwipe() for underflow. + Closes bug #18089. Reported by "gk", patch by "teor". + Bugfix on 0.2.3.25 and 0.2.4.6-alpha (#7352), + commit 49dd5ef3 on 7 Nov 2012. diff --git a/src/common/crypto.c b/src/common/crypto.c index 925beb3..f913917 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2972,6 +2972,7 @@ secret_to_key(char *key_out, size_t key_out_len, const char *secret, /** * Destroy the sz bytes of data stored at mem, setting them to * the value byte. + * If mem is NULL or sz is zero, nothing happens. * * This function is preferable to memset, since many compilers will happily * optimize out memset() when they can convince themselves that the data being @@ -2989,6 +2990,13 @@ secret_to_key(char *key_out, size_t key_out_len, const char *secret, void memwipe(void *mem, uint8_t byte, size_t sz) { + if (mem == NULL || sz == 0) { + return; + } + + /* Data this large is likely to be an underflow. */ + tor_assert(sz < SIZE_T_CEILING); + /* Because whole-program-optimization exists, we may not be able to just * have this function call "memset". A smart compiler could inline it, then * eliminate dead memsets, and declare itself to be clever. */

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 7b24f3e0fef04cdb21cd0b73ec4fde457702a81b Merge: c77ace6 eb72365 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:33 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 05ec055c417c80bf7b13914fade70a72f11accc5 Merge: 332543b 51675f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:38:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug17404 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit eb72365554451f5e129169bb1216a9610f7ff183 Merge: 8c91cbb 8936c50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:25 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 8936c50d83f3a90fb6bb3314b86f56f46d42d749 Merge: da0d5ad 05ec055 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:39:07 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug17404 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit a85fdabc60fee6db1d40129cd621c39b2772c0d1 Merge: 5cdc7a4 0f46f7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 08:41:43 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9

1 0